Merge branch '0.9.x' into userflag

168 files changed, 110880 insertions, 26518 deletions

diff --git a/EVENTS.txt b/EVENTS.txt
index a8a77390f..201ce7dfe 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -474,3 +474,18 @@ StartPublicXRDS: Start XRDS output (right after the opening XRDS tag)
 EndPublicXRDS: End XRDS output (right before the closing XRDS tag)
 - $action: the current action
 - &$xrdsoutputter - XRDSOutputter object to write to
+
+CheckPassword: Check a username/password
+- $nickname: The nickname to check
+- $password: The password to check
+- &$authenticated: set to true to indicate authentication succeeded.
+
+AutoRegister: Register a new user with the given nickname. Should insert a new User and Profile into the database.
+- $nickname: The nickname to register
+
+ChangePassword: Handle a password change request
+- $nickname: user's nickname
+- $oldpassword: the user's old password
+- $newpassword: the desired new password
+- &$errormsg: set this to an error message if the password could not be changed. If the password was changed, leave this as false
+
diff --git a/README b/README
index 952c914fe..7ecd025ac 100644
--- a/README
+++ b/README
@@ -151,6 +151,8 @@ released Aug 26 2009. Notable changes this version:
 - Check for site servername config'd.
 - Compatibility fix for empty status updates with Twitter API.
 - Option to show files privately (EXPERIMENTAL! Use with caution.)
+- a script to register a new user.
+- a script to make a user admin of a group.
 
 Prerequisites
 =============
diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php
new file mode 100644
index 000000000..72fb361bf
--- /dev/null
+++ b/actions/apiaccountupdateprofileimage.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Update the authenticating user's profile image
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Updates the authenticating user's profile image. Note that this API method
+ * expects raw multipart data, not a URL to an image.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiAccountUpdateProfileImageAction extends ApiAuthAction
+{
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user   = $this->auth_user;
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check whether the credentials are valid and output the result
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400, $this->format
+            );
+            return;
+        }
+
+        // Workaround for PHP returning empty $_POST and $_FILES when POST
+        // length > post_max_size in php.ini
+
+        if (empty($_FILES)
+            && empty($_POST)
+            && ($_SERVER['CONTENT_LENGTH'] > 0)
+        ) {
+             $msg = _('The server was unable to handle that much POST ' .
+                    'data (%s bytes) due to its current configuration.');
+
+            $this->clientError(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
+            return;
+        }
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return;
+        }
+
+        try {
+            $imagefile = ImageFile::fromUpload('image');
+        } catch (Exception $e) {
+            $this->clientError($e->getMessage(), 400, $this->format);
+            return;
+        }
+
+        $filename = Avatar::filename(
+            $user->id,
+            image_type_to_extension($imagefile->type),
+            null,
+            'tmp'.common_timestamp()
+        );
+
+        $filepath = Avatar::path($filename);
+
+        move_uploaded_file($imagefile->filepath, $filepath);
+
+        $profile = $this->user->getProfile();
+
+        if (empty($profile)) {
+            $this->clientError(_('User has no profile.'));
+            return;
+        }
+
+        $profile->setOriginal($filename);
+
+        common_broadcast_profile($profile);
+
+        $twitter_user = $this->twitterUserArray($this->user->getProfile(), true);
+
+        if ($this->format == 'xml') {
+            $this->initDocument('xml');
+            $this->showTwitterXmlUser($twitter_user);
+            $this->endDocument('xml');
+        } elseif ($this->format == 'json') {
+            $this->initDocument('json');
+            $this->showJsonObjects($twitter_user);
+            $this->endDocument('json');
+        }
+    }
+
+}
diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php
index ae50c512c..c040b9f6a 100644
--- a/actions/apifriendshipsexists.php
+++ b/actions/apifriendshipsexists.php
@@ -33,7 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Tests for the existence of friendship between two users. Will return true if
@@ -48,7 +48,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiFriendshipsExistsAction extends ApiAction
+class ApiFriendshipsExistsAction extends ApiPrivateAuthAction
 {
     var $user_a = null;
     var $user_b = null;
@@ -69,16 +69,7 @@ class ApiFriendshipsExistsAction extends ApiAction
         $user_a_id = $this->trimmed('user_a');
         $user_b_id = $this->trimmed('user_b');
 
-        common_debug("user_a = " . $user_a_id);
-        common_debug("user_b = " . $user_b_id);
-
-
         $this->user_a = $this->getTargetUser($user_a_id);
-
-        if (empty($this->user_a)) {
-            common_debug('gargargra');
-        }
-
         $this->user_b = $this->getTargetUser($user_b_id);
 
         return true;
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index 89469f36f..c597839a8 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns of the lastest 20 groups for the site
@@ -49,7 +49,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupListAllAction extends ApiAction
+class ApiGroupListAllAction extends ApiPrivateAuthAction
 {
     var $groups   = null;
 
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index b31e47b39..d221a6418 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * List 20 newest members of the group specified by name or ID.
@@ -49,7 +49,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupMembershipAction extends ApiAction
+class ApiGroupMembershipAction extends ApiPrivateAuthAction
 {
     var $group    = null;
     var $profiles = null;
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index 2bdb22bc4..b745ff92f 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Outputs detailed information about the group specified by ID
@@ -49,7 +49,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupShowAction extends ApiAction
+class ApiGroupShowAction extends ApiPrivateAuthAction
 {
     var $group = null;
 
diff --git a/actions/apihelptest.php b/actions/apihelptest.php
index e4ef55f2e..f2c459e6f 100644
--- a/actions/apihelptest.php
+++ b/actions/apihelptest.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns the string "ok" in the requested format with a 200 OK HTTP status code.
@@ -45,7 +45,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiHelpTestAction extends ApiAction
+class ApiHelpTestAction extends ApiPrivateAuthAction
 {
 
     /**
diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 3be22ca59..e26c009c4 100644
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -37,7 +37,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns the notice specified by id as a Twitter-style status and inline user
@@ -55,7 +55,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiStatusesShowAction extends ApiAction
+class ApiStatusesShowAction extends ApiPrivateAuthAction
 {
 
     var $notice_id = null;
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 898a4bd72..e369fa71e 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -80,7 +80,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
         $this->status = $this->trimmed('status');
         $this->source = $this->trimmed('source');
 
-        if (empty($this->source) || in_array($source, $this->reserved_sources)) {
+        if (empty($this->source) || in_array($source, self::$reserved_sources)) {
             $this->source = 'api';
         }
 
@@ -112,6 +112,20 @@ class ApiStatusesUpdateAction extends ApiAuthAction
             return;
         }
 
+        // Workaround for PHP returning empty $_POST and $_FILES when POST
+        // length > post_max_size in php.ini
+
+        if (empty($_FILES)
+            && empty($_POST)
+            && ($_SERVER['CONTENT_LENGTH'] > 0)
+        ) {
+             $msg = _('The server was unable to handle that much POST ' .
+                    'data (%s bytes) due to its current configuration.');
+
+            $this->clientError(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
+            return;
+        }
+
         if (empty($this->status)) {
             $this->clientError(
                 'Client must provide a \'status\' parameter with a value.',
@@ -126,13 +140,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction
             return;
         }
 
-        // Workaround for PHP returning empty $_FILES when POST length > PHP settings
-
-        if (empty($_POST) && ($_SERVER['CONTENT_LENGTH'] > 0)) {
-            $this->clientError(_('Unable to handle that much POST data!'));
-            return;
-        }
-
         $status_shortened = common_shorten_links($this->status);
 
         if (Notice::contentTooLong($status_shortened)) {
diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php
index e73ab983b..bbf891a89 100644
--- a/actions/apistatusnetversion.php
+++ b/actions/apistatusnetversion.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns a version number for this version of StatusNet, which
@@ -48,7 +48,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiStatusnetVersionAction extends ApiAction
+class ApiStatusnetVersionAction extends ApiPrivateAuthAction
 {
     /**
      * Take arguments for running
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 1ea35866e..66dd3f2b2 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -72,7 +72,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
     function prepare($args)
     {
         parent::prepare($args);
-
+        common_debug("api friends_timeline");
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 5d0542918..f25f6ba51 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns the most recent notices (default 20) posted to the group specified by ID
@@ -49,7 +49,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiTimelineGroupAction extends ApiAction
+class ApiTimelineGroupAction extends ApiPrivateAuthAction
 {
 
     var $group   = null;
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 58e267734..7a8504259 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -37,7 +37,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns the most recent notices (default 20) posted by everybody
@@ -55,7 +55,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiTimelinePublicAction extends ApiAction
+class ApiTimelinePublicAction extends ApiPrivateAuthAction
 {
 
     var $notices = null;
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index a274daac0..452593c11 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns the 20 most recent notices tagged by a given tag
@@ -49,7 +49,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiTimelineTagAction extends ApiAction
+class ApiTimelineTagAction extends ApiPrivateAuthAction
 {
 
     var $notices = null;
diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index b3a939b43..aa7aec5a4 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Ouputs information for a user, specified by ID or screen name.
@@ -50,7 +50,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiUserShowAction extends ApiAction
+class ApiUserShowAction extends ApiPrivateAuthAction
 {
     /**
      * Take arguments for running
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index ded419dd7..879e44842 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -244,11 +244,25 @@ class AvatarsettingsAction extends AccountSettingsAction
 
     function handlePost()
     {
+        // Workaround for PHP returning empty $_POST and $_FILES when POST
+        // length > post_max_size in php.ini
+
+        if (empty($_FILES)
+            && empty($_POST)
+            && ($_SERVER['CONTENT_LENGTH'] > 0)
+        ) {
+            $msg = _('The server was unable to handle that much POST ' .
+                'data (%s bytes) due to its current configuration.');
+
+            $this->showForm(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
+            return;
+        }
+
         // CSRF protection
 
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. '.
+            $this->showForm(_('There was a problem with your session token. '.
                                'Try again, please.'));
             return;
         }
diff --git a/actions/login.php b/actions/login.php
index f6d016310..ad57dd667 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -79,6 +79,8 @@ class LoginAction extends Action
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkLogin();
+        } else if (isset($args['user_id']) && isset($args['token'])){
+            $this->checkLogin($args['user_id'],$args['token']);
         } else {
             common_ensure_session();
             $this->showForm();
@@ -95,23 +97,48 @@ class LoginAction extends Action
      * @return void
      */
 
-    function checkLogin()
+    function checkLogin($user_id=null, $token=null)
     {
-        // XXX: login throttle
-
-        // CSRF protection - token set in NoticeForm
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->clientError(_('There was a problem with your session token. '.
-                                 'Try again, please.'));
-            return;
+        if(isset($token) && isset($user_id)){
+            //Token based login (from the LoginCommand)
+            $login_token = Login_token::staticGet('user_id',$user_id);
+            if($login_token && $login_token->token == $token){
+                if($login_token->modified > time()+2*60){
+                    //token has expired
+                    //delete the token as it is useless
+                    $login_token->delete();
+                    $this->showForm(_('Invalid or expired token.'));
+                    return;
+                }else{
+                    //delete the token so it cannot be reused
+                    $login_token->delete();
+                    //it's a valid token - let them log in
+                    $user = User::staticGet('id', $user_id);
+                    //$user = User::staticGet('nickname', "candrews");
+                }
+            }else{
+                $this->showForm(_('Invalid or expired token.'));
+                return;
+            }
+        }else{
+            // Regular form submission login
+
+            // XXX: login throttle
+
+            // CSRF protection - token set in NoticeForm
+            $token = $this->trimmed('token');
+            if (!$token || $token != common_session_token()) {
+                $this->clientError(_('There was a problem with your session token. '.
+                                     'Try again, please.'));
+                return;
+            }
+
+            $nickname = common_canonical_nickname($this->trimmed('nickname'));
+            $password = $this->arg('password');
+
+            $user = common_check_user($nickname, $password);
         }
 
-        $nickname = common_canonical_nickname($this->trimmed('nickname'));
-        $password = $this->arg('password');
-
-        $user = common_check_user($nickname, $password);
-
         if (!$user) {
             $this->showForm(_('Incorrect username or password.'));
             return;
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 37fca1ca2..095a7d1d3 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -224,15 +224,14 @@ class NewmessageAction extends Action
 
         $this->msg = $msg;
         if ($this->trimmed('ajax')) {
-            $this->startHTML('text/xml;charset=UTF-8');
+            header('Content-Type: text/xml;charset=utf-8');
+            $this->xw->startDocument('1.0', 'UTF-8');
+            $this->elementStart('html');
             $this->elementStart('head');
             $this->element('title', null, _('New message'));
             $this->elementEnd('head');
             $this->elementStart('body');
-            if (common_logged_in()) {
-                $this->showNoticeForm();
-            }
-            $this->elementEnd('div');
+            $this->showNoticeForm();
             $this->elementEnd('body');
             $this->endHTML();
         }
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index cd4beac3f..87eb45a7d 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -164,23 +164,32 @@ class PasswordsettingsAction extends AccountSettingsAction
                 $this->showForm(_('Incorrect old password'));
                 return;
             }
+        }else{
+            $oldpassword = null;
         }
 
-        $original = clone($user);
+        $errormsg = false;
+        if(! Event::handle('ChangePassword', array($user->nickname, $oldpassword, $newpassword, &$errormsg))){
+            //no handler changed the password, so change the password internally
+            $original = clone($user);
 
-        $user->password = common_munge_password($newpassword, $user->id);
+            $user->password = common_munge_password($newpassword, $user->id);
 
-        $val = $user->validate();
-        if ($val !== true) {
-            $this->showForm(_('Error saving user; invalid.'));
-            return;
-        }
+            $val = $user->validate();
+            if ($val !== true) {
+                $this->showForm(_('Error saving user; invalid.'));
+                return;
+            }
 
-        if (!$user->update($original)) {
-            $this->serverError(_('Can\'t save new password.'));
-            return;
+            if (!$user->update($original)) {
+                $this->serverError(_('Can\'t save new password.'));
+                return;
+            }
         }
 
-        $this->showForm(_('Password saved.'), true);
+        if($errormsg === false)
+            $this->showForm(_('Password saved.'), true);
+        else
+            $this->showForm($errormsg);
     }
 }
diff --git a/actions/register.php b/actions/register.php
index a6c1a903a..57f8e7bdf 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -56,6 +56,12 @@ class RegisterAction extends Action
     var $registered = false;
 
     /**
+     * Are we processing an invite?
+     */
+
+    var $invite = null;
+
+    /**
      * Prepare page to run
      *
      *
diff --git a/actions/showstream.php b/actions/showstream.php
index 4f4806037..663638c18 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -33,6 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 require_once INSTALLDIR.'/lib/personalgroupnav.php';
+require_once INSTALLDIR.'/lib/userprofile.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
 require_once INSTALLDIR.'/lib/profileminilist.php';
 require_once INSTALLDIR.'/lib/groupminilist.php';
@@ -181,262 +182,8 @@ class ShowstreamAction extends ProfileAction
 
     function showProfile()
     {
-        $this->showProfileData();
-        $this->showEntityActions();
-    }
-
-    function showProfileData()
-    {
-        if (Event::handle('StartProfilePageProfileSection', array(&$this, $this->profile))) {
-
-            $this->elementStart('div', 'entity_profile vcard author');
-            $this->element('h2', null, _('User profile'));
-
-            if (Event::handle('StartProfilePageProfileElements', array(&$this, $this->profile))) {
-
-                $this->showAvatar();
-                $this->showNickname();
-                $this->showFullName();
-                $this->showLocation();
-                $this->showHomepage();
-                $this->showBio();
-                $this->showProfileTags();
-
-                Event::handle('EndProfilePageProfileElements', array(&$this, $this->profile));
-            }
-
-            $this->elementEnd('div');
-            Event::handle('EndProfilePageProfileSection', array(&$this, $this->profile));
-        }
-    }
-
-    function showAvatar()
-    {
-        if (Event::handle('StartProfilePageAvatar', array($this, $this->profile))) {
-
-            $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-
-            $this->elementStart('dl', 'entity_depiction');
-            $this->element('dt', null, _('Photo'));
-            $this->elementStart('dd');
-            $this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
-                                        'class' => 'photo avatar',
-                                        'width' => AVATAR_PROFILE_SIZE,
-                                        'height' => AVATAR_PROFILE_SIZE,
-                                        'alt' => $this->profile->nickname));
-            $this->elementEnd('dd');
-
-            $user = User::staticGet('id', $this->profile->id);
-
-            $cur = common_current_user();
-            if ($cur && $cur->id == $user->id) {
-                $this->elementStart('dd');
-                $this->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
-                $this->elementEnd('dd');
-            }
-
-            $this->elementEnd('dl');
-
-            Event::handle('EndProfilePageAvatar', array($this, $this->profile));
-        }
-    }
-
-    function showNickname()
-    {
-        if (Event::handle('StartProfilePageNickname', array($this, $this->profile))) {
-
-            $this->elementStart('dl', 'entity_nickname');
-            $this->element('dt', null, _('Nickname'));
-            $this->elementStart('dd');
-            $hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid';
-            $this->element('a', array('href' => $this->profile->profileurl,
-                                      'rel' => 'me', 'class' => $hasFN),
-                           $this->profile->nickname);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-
-            Event::handle('EndProfilePageNickname', array($this, $this->profile));
-        }
-    }
-
-    function showFullName()
-    {
-        if (Event::handle('StartProfilePageFullName', array($this, $this->profile))) {
-            if ($this->profile->fullname) {
-                $this->elementStart('dl', 'entity_fn');
-                $this->element('dt', null, _('Full name'));
-                $this->elementStart('dd');
-                $this->element('span', 'fn', $this->profile->fullname);
-                $this->elementEnd('dd');
-                $this->elementEnd('dl');
-            }
-            Event::handle('EndProfilePageFullName', array($this, $this->profile));
-        }
-    }
-
-    function showLocation()
-    {
-        if (Event::handle('StartProfilePageLocation', array($this, $this->profile))) {
-            if ($this->profile->location) {
-                $this->elementStart('dl', 'entity_location');
-                $this->element('dt', null, _('Location'));
-                $this->element('dd', 'label', $this->profile->location);
-                $this->elementEnd('dl');
-            }
-            Event::handle('EndProfilePageLocation', array($this, $this->profile));
-        }
-    }
-
-    function showHomepage()
-    {
-        if (Event::handle('StartProfilePageHomepage', array($this, $this->profile))) {
-            if ($this->profile->homepage) {
-                $this->elementStart('dl', 'entity_url');
-                $this->element('dt', null, _('URL'));
-                $this->elementStart('dd');
-                $this->element('a', array('href' => $this->profile->homepage,
-                                          'rel' => 'me', 'class' => 'url'),
-                               $this->profile->homepage);
-                $this->elementEnd('dd');
-                $this->elementEnd('dl');
-            }
-            Event::handle('EndProfilePageHomepage', array($this, $this->profile));
-        }
-    }
-
-    function showBio()
-    {
-        if (Event::handle('StartProfilePageBio', array($this, $this->profile))) {
-            if ($this->profile->bio) {
-                $this->elementStart('dl', 'entity_note');
-                $this->element('dt', null, _('Note'));
-                $this->element('dd', 'note', $this->profile->bio);
-                $this->elementEnd('dl');
-            }
-            Event::handle('EndProfilePageBio', array($this, $this->profile));
-        }
-    }
-
-    function showProfileTags()
-    {
-        if (Event::handle('StartProfilePageProfileTags', array($this, $this->profile))) {
-            $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
-
-            if (count($tags) > 0) {
-                $this->elementStart('dl', 'entity_tags');
-                $this->element('dt', null, _('Tags'));
-                $this->elementStart('dd');
-                $this->elementStart('ul', 'tags xoxo');
-                foreach ($tags as $tag) {
-                    $this->elementStart('li');
-                    // Avoid space by using raw output.
-                    $pt = '<span class="mark_hash">#</span><a rel="tag" href="' .
-                      common_local_url('peopletag', array('tag' => $tag)) .
-                      '">' . $tag . '</a>';
-                    $this->raw($pt);
-                    $this->elementEnd('li');
-                }
-                $this->elementEnd('ul');
-                $this->elementEnd('dd');
-                $this->elementEnd('dl');
-            }
-            Event::handle('EndProfilePageProfileTags', array($this, $this->profile));
-        }
-    }
-
-    function showEntityActions()
-    {
-        if (Event::handle('StartProfilePageActionsSection', array(&$this, $this->profile))) {
-
-            $cur = common_current_user();
-
-            $this->elementStart('div', 'entity_actions');
-            $this->element('h2', null, _('User actions'));
-            $this->elementStart('ul');
-
-            if (Event::handle('StartProfilePageActionsElements', array(&$this, $this->profile))) {
-                if (empty($cur)) { // not logged in
-                    $this->elementStart('li', 'entity_subscribe');
-                    $this->showRemoteSubscribeLink();
-                    $this->elementEnd('li');
-                } else {
-                    if ($cur->id == $this->profile->id) { // your own page
-                        $this->elementStart('li', 'entity_edit');
-                        $this->element('a', array('href' => common_local_url('profilesettings'),
-                                                  'title' => _('Edit profile settings')),
-                                       _('Edit'));
-                        $this->elementEnd('li');
-                    } else { // someone else's page
-
-                        // subscribe/unsubscribe button
-
-                        $this->elementStart('li', 'entity_subscribe');
-
-                        if ($cur->isSubscribed($this->profile)) {
-                            $usf = new UnsubscribeForm($this, $this->profile);
-                            $usf->show();
-                        } else {
-                            $sf = new SubscribeForm($this, $this->profile);
-                            $sf->show();
-                        }
-                        $this->elementEnd('li');
-
-                        if ($cur->mutuallySubscribed($this->user)) {
-
-                            // message
-
-                            $this->elementStart('li', 'entity_send-a-message');
-                            $this->element('a', array('href' => common_local_url('newmessage', array('to' => $this->user->id)),
-                                                      'title' => _('Send a direct message to this user')),
-                                           _('Message'));
-                            $this->elementEnd('li');
-
-                            // nudge
-
-                            if ($this->user->email && $this->user->emailnotifynudge) {
-                                $this->elementStart('li', 'entity_nudge');
-                                $nf = new NudgeForm($this, $this->user);
-                                $nf->show();
-                                $this->elementEnd('li');
-                            }
-                        }
-
-                        // block/unblock
-
-                        $blocked = $cur->hasBlocked($this->profile);
-                        $this->elementStart('li', 'entity_block');
-                        if ($blocked) {
-                            $ubf = new UnblockForm($this, $this->profile,
-                                                   array('action' => 'showstream',
-                                                         'nickname' => $this->profile->nickname));
-                            $ubf->show();
-                        } else {
-                            $bf = new BlockForm($this, $this->profile,
-                                                array('action' => 'showstream',
-                                                      'nickname' => $this->profile->nickname));
-                            $bf->show();
-                        }
-                        $this->elementEnd('li');
-                    }
-                }
-
-                Event::handle('EndProfilePageActionsElements', array(&$this, $this->profile));
-            }
-
-            $this->elementEnd('ul');
-            $this->elementEnd('div');
-
-            Event::handle('EndProfilePageActionsSection', array(&$this, $this->profile));
-        }
-    }
-
-    function showRemoteSubscribeLink()
-    {
-        $url = common_local_url('remotesubscribe',
-                                array('nickname' => $this->profile->nickname));
-        $this->element('a', array('href' => $url,
-                                  'class' => 'entity_remote_subscribe'),
-                       _('Subscribe'));
+        $profile = new UserProfile($this, $this->user, $this->profile);
+        $profile->show();
     }
 
     function showEmptyListMessage()
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 79052bf7d..08a6e8d8b 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -47,18 +47,15 @@ class File_redirection extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function _commonCurl($url, $redirs) {
-        $curlh = curl_init();
-        curl_setopt($curlh, CURLOPT_URL, $url);
-        curl_setopt($curlh, CURLOPT_AUTOREFERER, true); // # setup referer header when folowing redirects
-        curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 10); // # seconds to wait
-        curl_setopt($curlh, CURLOPT_MAXREDIRS, $redirs); // # max number of http redirections to follow
-        curl_setopt($curlh, CURLOPT_USERAGENT, USER_AGENT);
-        curl_setopt($curlh, CURLOPT_FOLLOWLOCATION, true); // Follow redirects
-        curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($curlh, CURLOPT_FILETIME, true);
-        curl_setopt($curlh, CURLOPT_HEADER, true); // Include header in output
-        return $curlh;
+    static function _commonHttp($url, $redirs) {
+        $request = new HTTPClient($url);
+        $request->setConfig(array(
+            'connect_timeout' => 10, // # seconds to wait
+            'max_redirs' => $redirs, // # max number of http redirections to follow
+            'follow_redirects' => true, // Follow redirects
+            'store_body' => false, // We won't need body content here.
+        ));
+        return $request;
     }
 
     function _redirectWhere_imp($short_url, $redirs = 10, $protected = false) {
@@ -82,32 +79,39 @@ class File_redirection extends Memcached_DataObject
         if(strpos($short_url,'://') === false){
             return $short_url;
         }
-        $curlh = File_redirection::_commonCurl($short_url, $redirs);
-        // Don't include body in output
-        curl_setopt($curlh, CURLOPT_NOBODY, true);
-        curl_exec($curlh);
-        $info = curl_getinfo($curlh);
-        curl_close($curlh);
-
-        if (405 == $info['http_code']) {
-            $curlh = File_redirection::_commonCurl($short_url, $redirs);
-            curl_exec($curlh);
-            $info = curl_getinfo($curlh);
-            curl_close($curlh);
+        try {
+            $request = self::_commonHttp($short_url, $redirs);
+            // Don't include body in output
+            $request->setMethod(HTTP_Request2::METHOD_HEAD);
+            $response = $request->send();
+
+            if (405 == $response->getStatus()) {
+                // Server doesn't support HEAD method? Can this really happen?
+                // We'll try again as a GET and ignore the response data.
+                $request = self::_commonHttp($short_url, $redirs);
+                $response = $request->send();
+            }
+        } catch (Exception $e) {
+            // Invalid URL or failure to reach server
+            return $short_url;
         }
 
-        if (!empty($info['redirect_count']) && File::isProtected($info['url'])) {
-            return File_redirection::_redirectWhere_imp($short_url, $info['redirect_count'] - 1, true);
+        if ($response->getRedirectCount() && File::isProtected($response->getUrl())) {
+            // Bump back up the redirect chain until we find a non-protected URL
+            return self::_redirectWhere_imp($short_url, $response->getRedirectCount() - 1, true);
         }
 
-        $ret = array('code' => $info['http_code']
-                , 'redirects' => $info['redirect_count']
-                , 'url' => $info['url']);
+        $ret = array('code' => $response->getStatus()
+                , 'redirects' => $response->getRedirectCount()
+                , 'url' => $response->getUrl());
 
-        if (!empty($info['content_type'])) $ret['type'] = $info['content_type'];
+        $type = $response->getHeader('Content-Type');
+        if ($type) $ret['type'] = $type;
         if ($protected) $ret['protected'] = true;
-        if (!empty($info['download_content_length'])) $ret['size'] = $info['download_content_length'];
-        if (isset($info['filetime']) && ($info['filetime'] > 0)) $ret['time'] = $info['filetime'];
+        $size = $response->getHeader('Content-Length'); // @fixme bytes?
+        if ($size) $ret['size'] = $size;
+        $time = $response->getHeader('Last-Modified');
+        if ($time) $ret['time'] = strtotime($time);
         return $ret;
     }
 
diff --git a/classes/Login_token.php b/classes/Login_token.php
new file mode 100644
index 000000000..bd6381f90
--- /dev/null
+++ b/classes/Login_token.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Table Definition for group_alias
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+class Login_token extends Memcached_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'login_token';         // table name
+    public $user_id;                         // int(4)  primary_key not_null
+    public $token;                           // char(32)  not_null
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Login_token',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+}
diff --git a/classes/Notice.php b/classes/Notice.php
index a9dbaa461..9886875cb 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -930,7 +930,10 @@ class Notice extends Memcached_DataObject
             $users = $group->getUserMembers();
             foreach ($users as $id) {
                 if (!array_key_exists($id, $ni)) {
-                    $ni[$id] = NOTICE_INBOX_SOURCE_GROUP;
+                    $user = User::staticGet('id', $id);
+                    if (!$user->hasBlocked($notice->profile_id)) {
+                        $ni[$id] = NOTICE_INBOX_SOURCE_GROUP;
+                    }
                 }
             }
         }
diff --git a/classes/User.php b/classes/User.php
index 3fa9cc152..96a64ccb2 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -117,8 +117,7 @@ class User extends Memcached_DataObject
     function allowed_nickname($nickname)
     {
         // XXX: should already be validated for size, content, etc.
-
-        $blacklist = array();
+        $blacklist = common_config('nickname', 'blacklist');
 
         //all directory and file names should be blacklisted
         $d = dir(INSTALLDIR);
@@ -126,8 +125,15 @@ class User extends Memcached_DataObject
             $blacklist[]=$entry;
         }
         $d->close();
-        $merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
-        return !in_array($nickname, $merged);
+
+        //all top level names in the router should be blacklisted
+        $router = Router::get();
+        foreach(array_keys($router->m->getPaths()) as $path){
+            if(preg_match('/^\/(.*?)[\/\?]/',$path,$matches)){
+                $blacklist[]=$matches[1];
+            }
+        }
+        return !in_array($nickname, $blacklist);
     }
 
     function getCurrentNotice($dt=null)
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 623790b10..912d05cdf 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -555,3 +555,14 @@ created = 142
 [user_role__keys]
 user_id = K
 role = K
+
+[login_token]
+user_id = 129
+token = 130
+created = 142
+modified = 384
+
+[login_token__keys]
+user_id = K
+token = K
+
diff --git a/db/08to09.sql b/db/08to09.sql
index 953e0e5f4..a0e37f0f1 100644
--- a/db/08to09.sql
+++ b/db/08to09.sql
@@ -32,3 +32,13 @@ create table user_role (
     constraint primary key (user_id, role)
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table login_token (
+    user_id integer not null comment 'user owning this token' references user (id),
+    token char(32) not null comment 'token useable for logging in',
+    created datetime not null comment 'date this record was created',
+    modified timestamp comment 'date this record was modified',
+
+    constraint primary key (user_id)
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 9e37314aa..197fcabfd 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -38,3 +38,13 @@ create table user_role (
     primary key (user_id, role)
 
 );
+
+create table login_token (
+    user_id integer not null /* comment 'user owning this token'*/ references user (id),
+    token char(32) not null /* comment 'token useable for logging in'*/,
+    created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
+    modified timestamp /* comment 'date this record was modified'*/,
+
+    constraint primary key (user_id)
+);
+
diff --git a/db/notice_source.sql b/db/notice_source.sql
index 2657763f4..5c5c939dd 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -7,6 +7,7 @@ VALUES
     ('anyio', 'Any.IO', 'http://any.io/', now()),
     ('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()),
     ('bti','bti','http://gregkh.github.com/bti/', now()),
+    ('choqok', 'Choqok', 'http://choqok.gnufolks.org/', now()),
     ('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()),
     ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
     ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
@@ -43,6 +44,7 @@ VALUES
     ('rygh.no','rygh.no','http://rygh.no/', now()),
     ('ryghsms','ryghsms','http://sms.rygh.no/', now()),
     ('smob','SMOB','http://smob.sioc-project.org/', now()),
+    ('socialoomphBfD4pMqz31', 'SocialOomph', 'http://www.socialoomph.com/', now()),
     ('spaz','Spaz','http://funkatron.com/spaz', now()),
     ('tarpipe','tarpipe','http://tarpipe.com/', now()),
     ('tjunar','Tjunar','http://nederflash.nl/boek/titels/tjunar-air', now()),
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 1524d8395..3ed4e2c48 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -575,3 +575,13 @@ create table location_namespace (
     modified timestamp comment 'date this record was modified'
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table login_token (
+    user_id integer not null comment 'user owning this token' references user (id),
+    token char(32) not null comment 'token useable for logging in',
+    created datetime not null comment 'date this record was created',
+    modified timestamp comment 'date this record was modified',
+
+    constraint primary key (user_id)
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 672877ddf..0e5e96c32 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -569,3 +569,13 @@ create table user_role (
     primary key (user_id, role)
 
 );
+
+create table login_token (
+    user_id integer not null /* comment 'user owning this token'*/ references user (id),
+    token char(32) not null /* comment 'token useable for logging in'*/,
+    created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
+    modified timestamp /* comment 'date this record was modified'*/,
+
+    constraint primary key (user_id)
+);
+
diff --git a/doc-src/bookmarklet b/doc-src/bookmarklet
index 6ce23bd0b..bab0ad445 100644
--- a/doc-src/bookmarklet
+++ b/doc-src/bookmarklet
@@ -2,4 +2,4 @@ A bookmarklet is a small piece of javascript code used as a bookmark. This one w
 
 Drag-and-drop the following link to your bookmarks bar or right-click it and add it to your browser favorites to keep it handy.
 
-<a href="javascript:(function(){var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=bookmarklet',l=d.location,e=encodeURIComponent,g=f+'&status_textarea=%22'+((e(s))?e(s):e(document.title))+'%22%20%E2%80%94%20'+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=450,height=200')){l.href=g;}}a();})()">Post to %%site.name%%</a>
+<a href="javascript:(function(){var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=bookmarklet',l=d.location,e=encodeURIComponent,g=f+'&status_textarea=%E2%80%9C'+((e(s))?e(s):e(document.title))+'%E2%80%9D%20%E2%80%94%20'+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=450,height=200')){l.href=g;}}a();})()">Post to %%site.name%%</a>
diff --git a/extlib/HTTP/Request2.php b/extlib/HTTP/Request2.php
new file mode 100644
index 000000000..e06bb86bc
--- /dev/null
+++ b/extlib/HTTP/Request2.php
@@ -0,0 +1,844 @@
+<?php

+/**

+ * Class representing a HTTP request

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Request2.php 278226 2009-04-03 21:32:48Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * A class representing an URL as per RFC 3986.

+ */

+require_once 'Net/URL2.php';

+

+/**

+ * Exception class for HTTP_Request2 package

+ */ 

+require_once 'HTTP/Request2/Exception.php';

+

+/**

+ * Class representing a HTTP request

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @version    Release: 0.4.1

+ * @link       http://tools.ietf.org/html/rfc2616#section-5

+ */

+class HTTP_Request2 implements SplSubject

+{

+   /**#@+

+    * Constants for HTTP request methods

+    *

+    * @link http://tools.ietf.org/html/rfc2616#section-5.1.1

+    */

+    const METHOD_OPTIONS = 'OPTIONS';

+    const METHOD_GET     = 'GET';

+    const METHOD_HEAD    = 'HEAD';

+    const METHOD_POST    = 'POST';

+    const METHOD_PUT     = 'PUT';

+    const METHOD_DELETE  = 'DELETE';

+    const METHOD_TRACE   = 'TRACE';

+    const METHOD_CONNECT = 'CONNECT';

+   /**#@-*/

+

+   /**#@+

+    * Constants for HTTP authentication schemes 

+    *

+    * @link http://tools.ietf.org/html/rfc2617

+    */

+    const AUTH_BASIC  = 'basic';

+    const AUTH_DIGEST = 'digest';

+   /**#@-*/

+

+   /**

+    * Regular expression used to check for invalid symbols in RFC 2616 tokens

+    * @link http://pear.php.net/bugs/bug.php?id=15630

+    */

+    const REGEXP_INVALID_TOKEN = '![\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]!';

+

+   /**

+    * Regular expression used to check for invalid symbols in cookie strings

+    * @link http://pear.php.net/bugs/bug.php?id=15630

+    * @link http://cgi.netscape.com/newsref/std/cookie_spec.html

+    */

+    const REGEXP_INVALID_COOKIE = '/[\s,;]/';

+

+   /**

+    * Fileinfo magic database resource

+    * @var  resource

+    * @see  detectMimeType()

+    */

+    private static $_fileinfoDb;

+

+   /**

+    * Observers attached to the request (instances of SplObserver)

+    * @var  array

+    */

+    protected $observers = array();

+

+   /**

+    * Request URL

+    * @var  Net_URL2

+    */

+    protected $url;

+

+   /**

+    * Request method

+    * @var  string

+    */

+    protected $method = self::METHOD_GET;

+

+   /**

+    * Authentication data

+    * @var  array

+    * @see  getAuth()

+    */

+    protected $auth;

+

+   /**

+    * Request headers

+    * @var  array

+    */

+    protected $headers = array();

+

+   /**

+    * Configuration parameters

+    * @var  array

+    * @see  setConfig()

+    */

+    protected $config = array(

+        'adapter'           => 'HTTP_Request2_Adapter_Socket',

+        'connect_timeout'   => 10,

+        'timeout'           => 0,

+        'use_brackets'      => true,

+        'protocol_version'  => '1.1',

+        'buffer_size'       => 16384,

+        'store_body'        => true,

+

+        'proxy_host'        => '',

+        'proxy_port'        => '',

+        'proxy_user'        => '',

+        'proxy_password'    => '',

+        'proxy_auth_scheme' => self::AUTH_BASIC,

+

+        'ssl_verify_peer'   => true,

+        'ssl_verify_host'   => true,

+        'ssl_cafile'        => null,

+        'ssl_capath'        => null,

+        'ssl_local_cert'    => null,

+        'ssl_passphrase'    => null,

+

+        'digest_compat_ie'  => false

+    );

+

+   /**

+    * Last event in request / response handling, intended for observers

+    * @var  array

+    * @see  getLastEvent()

+    */

+    protected $lastEvent = array(

+        'name' => 'start',

+        'data' => null

+    );

+

+   /**

+    * Request body

+    * @var  string|resource

+    * @see  setBody()

+    */

+    protected $body = '';

+

+   /**

+    * Array of POST parameters

+    * @var  array

+    */

+    protected $postParams = array();

+

+   /**

+    * Array of file uploads (for multipart/form-data POST requests) 

+    * @var  array

+    */

+    protected $uploads = array();

+

+   /**

+    * Adapter used to perform actual HTTP request

+    * @var  HTTP_Request2_Adapter

+    */

+    protected $adapter;

+

+

+   /**

+    * Constructor. Can set request URL, method and configuration array.

+    *

+    * Also sets a default value for User-Agent header. 

+    *

+    * @param    string|Net_Url2     Request URL

+    * @param    string              Request method

+    * @param    array               Configuration for this Request instance

+    */

+    public function __construct($url = null, $method = self::METHOD_GET, array $config = array())

+    {

+        if (!empty($url)) {

+            $this->setUrl($url);

+        }

+        if (!empty($method)) {

+            $this->setMethod($method);

+        }

+        $this->setConfig($config);

+        $this->setHeader('user-agent', 'HTTP_Request2/0.4.1 ' .

+                         '(http://pear.php.net/package/http_request2) ' .

+                         'PHP/' . phpversion());

+    }

+

+   /**

+    * Sets the URL for this request

+    *

+    * If the URL has userinfo part (username & password) these will be removed

+    * and converted to auth data. If the URL does not have a path component,

+    * that will be set to '/'.

+    *

+    * @param    string|Net_URL2 Request URL

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function setUrl($url)

+    {

+        if (is_string($url)) {

+            $url = new Net_URL2($url);

+        }

+        if (!$url instanceof Net_URL2) {

+            throw new HTTP_Request2_Exception('Parameter is not a valid HTTP URL');

+        }

+        // URL contains username / password?

+        if ($url->getUserinfo()) {

+            $username = $url->getUser();

+            $password = $url->getPassword();

+            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');

+            $url->setUserinfo('');

+        }

+        if ('' == $url->getPath()) {

+            $url->setPath('/');

+        }

+        $this->url = $url;

+

+        return $this;

+    }

+

+   /**

+    * Returns the request URL

+    *

+    * @return   Net_URL2

+    */

+    public function getUrl()

+    {

+        return $this->url;

+    }

+

+   /**

+    * Sets the request method

+    *

+    * @param    string

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception if the method name is invalid

+    */

+    public function setMethod($method)

+    {

+        // Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1

+        if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {

+            throw new HTTP_Request2_Exception("Invalid request method '{$method}'");

+        }

+        $this->method = $method;

+

+        return $this;

+    }

+

+   /**

+    * Returns the request method

+    *

+    * @return   string

+    */

+    public function getMethod()

+    {

+        return $this->method;

+    }

+

+   /**

+    * Sets the configuration parameter(s)

+    *

+    * The following parameters are available:

+    * <ul>

+    *   <li> 'adapter'           - adapter to use (string)</li>

+    *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>

+    *   <li> 'timeout'           - Total number of seconds a request can take.

+    *                              Use 0 for no limit, should be greater than 

+    *                              'connect_timeout' if set (integer)</li>

+    *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>

+    *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>

+    *   <li> 'buffer_size'       - Buffer size to use for reading and writing (int)</li>

+    *   <li> 'store_body'        - Whether to store response body in response object.

+    *                              Set to false if receiving a huge response and

+    *                              using an Observer to save it (boolean)</li>

+    *   <li> 'proxy_host'        - Proxy server host (string)</li>

+    *   <li> 'proxy_port'        - Proxy server port (integer)</li>

+    *   <li> 'proxy_user'        - Proxy auth username (string)</li>

+    *   <li> 'proxy_password'    - Proxy auth password (string)</li>

+    *   <li> 'proxy_auth_scheme' - Proxy auth scheme, one of HTTP_Request2::AUTH_* constants (string)</li>

+    *   <li> 'ssl_verify_peer'   - Whether to verify peer's SSL certificate (bool)</li>

+    *   <li> 'ssl_verify_host'   - Whether to check that Common Name in SSL

+    *                              certificate matches host name (bool)</li>

+    *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer

+    *                              with (use with 'ssl_verify_peer') (string)</li>

+    *   <li> 'ssl_capath'        - Directory holding multiple Certificate 

+    *                              Authority files (string)</li>

+    *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>

+    *   <li> 'ssl_passphrase'    - Passphrase with which local certificate

+    *                              was encoded (string)</li>

+    *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6

+    *                              in using URL without query string in digest

+    *                              authentication (boolean)</li>

+    * </ul>

+    *

+    * @param    string|array    configuration parameter name or array

+    *                           ('parameter name' => 'parameter value')

+    * @param    mixed           parameter value if $nameOrConfig is not an array

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception If the parameter is unknown

+    */

+    public function setConfig($nameOrConfig, $value = null)

+    {

+        if (is_array($nameOrConfig)) {

+            foreach ($nameOrConfig as $name => $value) {

+                $this->setConfig($name, $value);

+            }

+

+        } else {

+            if (!array_key_exists($nameOrConfig, $this->config)) {

+                throw new HTTP_Request2_Exception(

+                    "Unknown configuration parameter '{$nameOrConfig}'"

+                );

+            }

+            $this->config[$nameOrConfig] = $value;

+        }

+

+        return $this;

+    }

+

+   /**

+    * Returns the value(s) of the configuration parameter(s)

+    *

+    * @param    string  parameter name

+    * @return   mixed   value of $name parameter, array of all configuration 

+    *                   parameters if $name is not given

+    * @throws   HTTP_Request2_Exception If the parameter is unknown

+    */

+    public function getConfig($name = null)

+    {

+        if (null === $name) {

+            return $this->config;

+        } elseif (!array_key_exists($name, $this->config)) {

+            throw new HTTP_Request2_Exception(

+                "Unknown configuration parameter '{$name}'"

+            );

+        }

+        return $this->config[$name];

+    }

+

+   /**

+    * Sets the autentification data

+    *

+    * @param    string  user name

+    * @param    string  password

+    * @param    string  authentication scheme

+    * @return   HTTP_Request2

+    */ 

+    public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)

+    {

+        if (empty($user)) {

+            $this->auth = null;

+        } else {

+            $this->auth = array(

+                'user'     => (string)$user,

+                'password' => (string)$password,

+                'scheme'   => $scheme

+            );

+        }

+

+        return $this;

+    }

+

+   /**

+    * Returns the authentication data

+    *

+    * The array has the keys 'user', 'password' and 'scheme', where 'scheme'

+    * is one of the HTTP_Request2::AUTH_* constants.

+    *

+    * @return   array

+    */

+    public function getAuth()

+    {

+        return $this->auth;

+    }

+

+   /**

+    * Sets request header(s)

+    *

+    * The first parameter may be either a full header string 'header: value' or

+    * header name. In the former case $value parameter is ignored, in the latter 

+    * the header's value will either be set to $value or the header will be

+    * removed if $value is null. The first parameter can also be an array of

+    * headers, in that case method will be called recursively.

+    *

+    * Note that headers are treated case insensitively as per RFC 2616.

+    * 

+    * <code>

+    * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'

+    * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'

+    * $req->setHeader(array('foo' => 'Quux')); // sets the value of 'Foo' header to 'Quux'

+    * $req->setHeader('FOO'); // removes 'Foo' header from request

+    * </code>

+    *

+    * @param    string|array    header name, header string ('Header: value')

+    *                           or an array of headers

+    * @param    string|null     header value, header will be removed if null

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function setHeader($name, $value = null)

+    {

+        if (is_array($name)) {

+            foreach ($name as $k => $v) {

+                if (is_string($k)) {

+                    $this->setHeader($k, $v);

+                } else {

+                    $this->setHeader($v);

+                }

+            }

+        } else {

+            if (null === $value && strpos($name, ':')) {

+                list($name, $value) = array_map('trim', explode(':', $name, 2));

+            }

+            // Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2

+            if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {

+                throw new HTTP_Request2_Exception("Invalid header name '{$name}'");

+            }

+            // Header names are case insensitive anyway

+            $name = strtolower($name);

+            if (null === $value) {

+                unset($this->headers[$name]);

+            } else {

+                $this->headers[$name] = $value;

+            }

+        }

+        

+        return $this;

+    }

+

+   /**

+    * Returns the request headers

+    *

+    * The array is of the form ('header name' => 'header value'), header names

+    * are lowercased

+    *

+    * @return   array

+    */

+    public function getHeaders()

+    {

+        return $this->headers;

+    }

+

+   /**

+    * Appends a cookie to "Cookie:" header

+    *

+    * @param    string  cookie name

+    * @param    string  cookie value

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function addCookie($name, $value)

+    {

+        $cookie = $name . '=' . $value;

+        if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {

+            throw new HTTP_Request2_Exception("Invalid cookie: '{$cookie}'");

+        }

+        $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';

+        $this->setHeader('cookie', $cookies . $cookie);

+

+        return $this;

+    }

+

+   /**

+    * Sets the request body

+    *

+    * @param    string  Either a string with the body or filename containing body

+    * @param    bool    Whether first parameter is a filename

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function setBody($body, $isFilename = false)

+    {

+        if (!$isFilename) {

+            $this->body = (string)$body;

+        } else {

+            if (!($fp = @fopen($body, 'rb'))) {

+                throw new HTTP_Request2_Exception("Cannot open file {$body}");

+            }

+            $this->body = $fp;

+            if (empty($this->headers['content-type'])) {

+                $this->setHeader('content-type', self::detectMimeType($body));

+            }

+        }

+

+        return $this;

+    }

+

+   /**

+    * Returns the request body

+    *

+    * @return   string|resource|HTTP_Request2_MultipartBody

+    */

+    public function getBody()

+    {

+        if (self::METHOD_POST == $this->method && 

+            (!empty($this->postParams) || !empty($this->uploads))

+        ) {

+            if ('application/x-www-form-urlencoded' == $this->headers['content-type']) {

+                $body = http_build_query($this->postParams, '', '&');

+                if (!$this->getConfig('use_brackets')) {

+                    $body = preg_replace('/%5B\d+%5D=/', '=', $body);

+                }

+                // support RFC 3986 by not encoding '~' symbol (request #15368)

+                return str_replace('%7E', '~', $body);

+

+            } elseif ('multipart/form-data' == $this->headers['content-type']) {

+                require_once 'HTTP/Request2/MultipartBody.php';

+                return new HTTP_Request2_MultipartBody(

+                    $this->postParams, $this->uploads, $this->getConfig('use_brackets')

+                );

+            }

+        }

+        return $this->body;

+    }

+

+   /**

+    * Adds a file to form-based file upload

+    *

+    * Used to emulate file upload via a HTML form. The method also sets

+    * Content-Type of HTTP request to 'multipart/form-data'.

+    *

+    * If you just want to send the contents of a file as the body of HTTP

+    * request you should use setBody() method.

+    *

+    * @param    string  name of file-upload field

+    * @param    mixed   full name of local file

+    * @param    string  filename to send in the request 

+    * @param    string  content-type of file being uploaded

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function addUpload($fieldName, $filename, $sendFilename = null,

+                              $contentType = null)

+    {

+        if (!is_array($filename)) {

+            if (!($fp = @fopen($filename, 'rb'))) {

+                throw new HTTP_Request2_Exception("Cannot open file {$filename}");

+            }

+            $this->uploads[$fieldName] = array(

+                'fp'        => $fp,

+                'filename'  => empty($sendFilename)? basename($filename): $sendFilename,

+                'size'      => filesize($filename),

+                'type'      => empty($contentType)? self::detectMimeType($filename): $contentType

+            );

+        } else {

+            $fps = $names = $sizes = $types = array();

+            foreach ($filename as $f) {

+                if (!is_array($f)) {

+                    $f = array($f);

+                }

+                if (!($fp = @fopen($f[0], 'rb'))) {

+                    throw new HTTP_Request2_Exception("Cannot open file {$f[0]}");

+                }

+                $fps[]   = $fp;

+                $names[] = empty($f[1])? basename($f[0]): $f[1];

+                $sizes[] = filesize($f[0]);

+                $types[] = empty($f[2])? self::detectMimeType($f[0]): $f[2];

+            }

+            $this->uploads[$fieldName] = array(

+                'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types

+            );

+        }

+        if (empty($this->headers['content-type']) ||

+            'application/x-www-form-urlencoded' == $this->headers['content-type']

+        ) {

+            $this->setHeader('content-type', 'multipart/form-data');

+        }

+

+        return $this;

+    }

+

+   /**

+    * Adds POST parameter(s) to the request.

+    *

+    * @param    string|array    parameter name or array ('name' => 'value')

+    * @param    mixed           parameter value (can be an array)

+    * @return   HTTP_Request2

+    */

+    public function addPostParameter($name, $value = null)

+    {

+        if (!is_array($name)) {

+            $this->postParams[$name] = $value;

+        } else {

+            foreach ($name as $k => $v) {

+                $this->addPostParameter($k, $v);

+            }

+        }

+        if (empty($this->headers['content-type'])) {

+            $this->setHeader('content-type', 'application/x-www-form-urlencoded');

+        }

+

+        return $this;

+    }

+

+   /**

+    * Attaches a new observer

+    *

+    * @param    SplObserver

+    */

+    public function attach(SplObserver $observer)

+    {

+        foreach ($this->observers as $attached) {

+            if ($attached === $observer) {

+                return;

+            }

+        }

+        $this->observers[] = $observer;

+    }

+

+   /**

+    * Detaches an existing observer

+    *

+    * @param    SplObserver

+    */

+    public function detach(SplObserver $observer)

+    {

+        foreach ($this->observers as $key => $attached) {

+            if ($attached === $observer) {

+                unset($this->observers[$key]);

+                return;

+            }

+        }

+    }

+

+   /**

+    * Notifies all observers

+    */

+    public function notify()

+    {

+        foreach ($this->observers as $observer) {

+            $observer->update($this);

+        }

+    }

+

+   /**

+    * Sets the last event

+    *

+    * Adapters should use this method to set the current state of the request

+    * and notify the observers.

+    *

+    * @param    string  event name

+    * @param    mixed   event data

+    */

+    public function setLastEvent($name, $data = null)

+    {

+        $this->lastEvent = array(

+            'name' => $name,

+            'data' => $data

+        );

+        $this->notify();

+    }

+

+   /**

+    * Returns the last event

+    *

+    * Observers should use this method to access the last change in request.

+    * The following event names are possible:

+    * <ul>

+    *   <li>'connect'                 - after connection to remote server,

+    *                                   data is the destination (string)</li>

+    *   <li>'disconnect'              - after disconnection from server</li>

+    *   <li>'sentHeaders'             - after sending the request headers,

+    *                                   data is the headers sent (string)</li>

+    *   <li>'sentBodyPart'            - after sending a part of the request body, 

+    *                                   data is the length of that part (int)</li>

+    *   <li>'receivedHeaders'         - after receiving the response headers,

+    *                                   data is HTTP_Request2_Response object</li>

+    *   <li>'receivedBodyPart'        - after receiving a part of the response

+    *                                   body, data is that part (string)</li>

+    *   <li>'receivedEncodedBodyPart' - as 'receivedBodyPart', but data is still

+    *                                   encoded by Content-Encoding</li>

+    *   <li>'receivedBody'            - after receiving the complete response

+    *                                   body, data is HTTP_Request2_Response object</li>

+    * </ul>

+    * Different adapters may not send all the event types. Mock adapter does

+    * not send any events to the observers.

+    *

+    * @return   array   The array has two keys: 'name' and 'data'

+    */

+    public function getLastEvent()

+    {

+        return $this->lastEvent;

+    }

+

+   /**

+    * Sets the adapter used to actually perform the request

+    *

+    * You can pass either an instance of a class implementing HTTP_Request2_Adapter

+    * or a class name. The method will only try to include a file if the class

+    * name starts with HTTP_Request2_Adapter_, it will also try to prepend this

+    * prefix to the class name if it doesn't contain any underscores, so that

+    * <code>

+    * $request->setAdapter('curl');

+    * </code>

+    * will work.

+    *

+    * @param    string|HTTP_Request2_Adapter

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function setAdapter($adapter)

+    {

+        if (is_string($adapter)) {

+            if (!class_exists($adapter, false)) {

+                if (false === strpos($adapter, '_')) {

+                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);

+                }

+                if (preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)) {

+                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';

+                }

+                if (!class_exists($adapter, false)) {

+                    throw new HTTP_Request2_Exception("Class {$adapter} not found");

+                }

+            }

+            $adapter = new $adapter;

+        }

+        if (!$adapter instanceof HTTP_Request2_Adapter) {

+            throw new HTTP_Request2_Exception('Parameter is not a HTTP request adapter');

+        }

+        $this->adapter = $adapter;

+

+        return $this;

+    }

+

+   /**

+    * Sends the request and returns the response

+    *

+    * @throws   HTTP_Request2_Exception

+    * @return   HTTP_Request2_Response

+    */

+    public function send()

+    {

+        // Sanity check for URL

+        if (!$this->url instanceof Net_URL2) {

+            throw new HTTP_Request2_Exception('No URL given');

+        } elseif (!$this->url->isAbsolute()) {

+            throw new HTTP_Request2_Exception('Absolute URL required');

+        } elseif (!in_array(strtolower($this->url->getScheme()), array('https', 'http'))) {

+            throw new HTTP_Request2_Exception('Not a HTTP URL');

+        }

+        if (empty($this->adapter)) {

+            $this->setAdapter($this->getConfig('adapter'));

+        }

+        // magic_quotes_runtime may break file uploads and chunked response

+        // processing; see bug #4543

+        if ($magicQuotes = ini_get('magic_quotes_runtime')) {

+            ini_set('magic_quotes_runtime', false);

+        }

+        // force using single byte encoding if mbstring extension overloads

+        // strlen() and substr(); see bug #1781, bug #10605

+        if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {

+            $oldEncoding = mb_internal_encoding();

+            mb_internal_encoding('iso-8859-1');

+        }

+

+        try {

+            $response = $this->adapter->sendRequest($this);

+        } catch (Exception $e) {

+        }

+        // cleanup in either case (poor man's "finally" clause)

+        if ($magicQuotes) {

+            ini_set('magic_quotes_runtime', true);

+        }

+        if (!empty($oldEncoding)) {

+            mb_internal_encoding($oldEncoding);

+        }

+        // rethrow the exception

+        if (!empty($e)) {

+            throw $e;

+        }

+        return $response;

+    }

+

+   /**

+    * Tries to detect MIME type of a file

+    *

+    * The method will try to use fileinfo extension if it is available,

+    * deprecated mime_content_type() function in the other case. If neither

+    * works, default 'application/octet-stream' MIME type is returned

+    *

+    * @param    string  filename

+    * @return   string  file MIME type

+    */

+    protected static function detectMimeType($filename)

+    {

+        // finfo extension from PECL available 

+        if (function_exists('finfo_open')) {

+            if (!isset(self::$_fileinfoDb)) {

+                self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);

+            }

+            if (self::$_fileinfoDb) { 

+                $info = finfo_file(self::$_fileinfoDb, $filename);

+            }

+        }

+        // (deprecated) mime_content_type function available

+        if (empty($info) && function_exists('mime_content_type')) {

+            return mime_content_type($filename);

+        }

+        return empty($info)? 'application/octet-stream': $info;

+    }

+}

+?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/Adapter.php b/extlib/HTTP/Request2/Adapter.php
new file mode 100644
index 000000000..39b092b34
--- /dev/null
+++ b/extlib/HTTP/Request2/Adapter.php
@@ -0,0 +1,152 @@
+<?php

+/**

+ * Base class for HTTP_Request2 adapters

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Adapter.php 274684 2009-01-26 23:07:27Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Class representing a HTTP response

+ */

+require_once 'HTTP/Request2/Response.php';

+

+/**

+ * Base class for HTTP_Request2 adapters

+ *

+ * HTTP_Request2 class itself only defines methods for aggregating the request

+ * data, all actual work of sending the request to the remote server and 

+ * receiving its response is performed by adapters.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @version    Release: 0.4.1

+ */

+abstract class HTTP_Request2_Adapter

+{

+   /**

+    * A list of methods that MUST NOT have a request body, per RFC 2616

+    * @var  array

+    */

+    protected static $bodyDisallowed = array('TRACE');

+

+   /**

+    * Methods having defined semantics for request body

+    *

+    * Content-Length header (indicating that the body follows, section 4.3 of

+    * RFC 2616) will be sent for these methods even if no body was added

+    *

+    * @var  array

+    * @link http://pear.php.net/bugs/bug.php?id=12900

+    * @link http://pear.php.net/bugs/bug.php?id=14740

+    */

+    protected static $bodyRequired = array('POST', 'PUT');

+

+   /**

+    * Request being sent

+    * @var  HTTP_Request2

+    */

+    protected $request;

+

+   /**

+    * Request body

+    * @var  string|resource|HTTP_Request2_MultipartBody

+    * @see  HTTP_Request2::getBody()

+    */

+    protected $requestBody;

+

+   /**

+    * Length of the request body

+    * @var  integer

+    */

+    protected $contentLength;

+

+   /**

+    * Sends request to the remote server and returns its response

+    *

+    * @param    HTTP_Request2

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    abstract public function sendRequest(HTTP_Request2 $request);

+

+   /**

+    * Calculates length of the request body, adds proper headers

+    *

+    * @param    array   associative array of request headers, this method will 

+    *                   add proper 'Content-Length' and 'Content-Type' headers 

+    *                   to this array (or remove them if not needed)

+    */

+    protected function calculateRequestLength(&$headers)

+    {

+        $this->requestBody = $this->request->getBody();

+

+        if (is_string($this->requestBody)) {

+            $this->contentLength = strlen($this->requestBody);

+        } elseif (is_resource($this->requestBody)) {

+            $stat = fstat($this->requestBody);

+            $this->contentLength = $stat['size'];

+            rewind($this->requestBody);

+        } else {

+            $this->contentLength = $this->requestBody->getLength();

+            $headers['content-type'] = 'multipart/form-data; boundary=' .

+                                       $this->requestBody->getBoundary();

+            $this->requestBody->rewind();

+        }

+

+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||

+            0 == $this->contentLength

+        ) {

+            unset($headers['content-type']);

+            // No body: send a Content-Length header nonetheless (request #12900),

+            // but do that only for methods that require a body (bug #14740)

+            if (in_array($this->request->getMethod(), self::$bodyRequired)) {

+                $headers['content-length'] = 0;

+            } else {

+                unset($headers['content-length']);

+            }

+        } else {

+            if (empty($headers['content-type'])) {

+                $headers['content-type'] = 'application/x-www-form-urlencoded';

+            }

+            $headers['content-length'] = $this->contentLength;

+        }

+    }

+}

+?>

diff --git a/extlib/HTTP/Request2/Adapter/Curl.php b/extlib/HTTP/Request2/Adapter/Curl.php
new file mode 100644
index 000000000..4d4de0dcc
--- /dev/null
+++ b/extlib/HTTP/Request2/Adapter/Curl.php
@@ -0,0 +1,383 @@
+<?php

+/**

+ * Adapter for HTTP_Request2 wrapping around cURL extension

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Curl.php 278226 2009-04-03 21:32:48Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Base class for HTTP_Request2 adapters

+ */

+require_once 'HTTP/Request2/Adapter.php';

+

+/**

+ * Adapter for HTTP_Request2 wrapping around cURL extension

+ *

+ * @category    HTTP

+ * @package     HTTP_Request2

+ * @author      Alexey Borzov <avb@php.net>

+ * @version     Release: 0.4.1

+ */

+class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter

+{

+   /**

+    * Mapping of header names to cURL options

+    * @var  array

+    */

+    protected static $headerMap = array(

+        'accept-encoding' => CURLOPT_ENCODING,

+        'cookie'          => CURLOPT_COOKIE,

+        'referer'         => CURLOPT_REFERER,

+        'user-agent'      => CURLOPT_USERAGENT

+    );

+

+   /**

+    * Mapping of SSL context options to cURL options

+    * @var  array

+    */

+    protected static $sslContextMap = array(

+        'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,

+        'ssl_cafile'      => CURLOPT_CAINFO,

+        'ssl_capath'      => CURLOPT_CAPATH,

+        'ssl_local_cert'  => CURLOPT_SSLCERT,

+        'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD

+   );

+

+   /**

+    * Response being received

+    * @var  HTTP_Request2_Response

+    */

+    protected $response;

+

+   /**

+    * Whether 'sentHeaders' event was sent to observers

+    * @var  boolean

+    */

+    protected $eventSentHeaders = false;

+

+   /**

+    * Whether 'receivedHeaders' event was sent to observers

+    * @var boolean

+    */

+    protected $eventReceivedHeaders = false;

+

+   /**

+    * Position within request body

+    * @var  integer

+    * @see  callbackReadBody()

+    */

+    protected $position = 0;

+

+   /**

+    * Information about last transfer, as returned by curl_getinfo()

+    * @var  array

+    */

+    protected $lastInfo;

+

+   /**

+    * Sends request to the remote server and returns its response

+    *

+    * @param    HTTP_Request2

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    public function sendRequest(HTTP_Request2 $request)

+    {

+        if (!extension_loaded('curl')) {

+            throw new HTTP_Request2_Exception('cURL extension not available');

+        }

+

+        $this->request              = $request;

+        $this->response             = null;

+        $this->position             = 0;

+        $this->eventSentHeaders     = false;

+        $this->eventReceivedHeaders = false;

+

+        try {

+            if (false === curl_exec($ch = $this->createCurlHandle())) {

+                $errorMessage = 'Error sending request: #' . curl_errno($ch) .

+                                                       ' ' . curl_error($ch);

+            }

+        } catch (Exception $e) {

+        }

+        $this->lastInfo = curl_getinfo($ch);

+        curl_close($ch);

+

+        if (!empty($e)) {

+            throw $e;

+        } elseif (!empty($errorMessage)) {

+            throw new HTTP_Request2_Exception($errorMessage);

+        }

+

+        if (0 < $this->lastInfo['size_download']) {

+            $this->request->setLastEvent('receivedBody', $this->response);

+        }

+        return $this->response;

+    }

+

+   /**

+    * Returns information about last transfer

+    *

+    * @return   array   associative array as returned by curl_getinfo()

+    */

+    public function getInfo()

+    {

+        return $this->lastInfo;

+    }

+

+   /**

+    * Creates a new cURL handle and populates it with data from the request

+    *

+    * @return   resource    a cURL handle, as created by curl_init()

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function createCurlHandle()

+    {

+        $ch = curl_init();

+

+        curl_setopt_array($ch, array(

+            // setup callbacks

+            CURLOPT_READFUNCTION   => array($this, 'callbackReadBody'),

+            CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),

+            CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),

+            // disallow redirects

+            CURLOPT_FOLLOWLOCATION => false,

+            // buffer size

+            CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),

+            // connection timeout

+            CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),

+            // save full outgoing headers, in case someone is interested

+            CURLINFO_HEADER_OUT    => true,

+            // request url

+            CURLOPT_URL            => $this->request->getUrl()->getUrl()

+        ));

+

+        // request timeout

+        if ($timeout = $this->request->getConfig('timeout')) {

+            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);

+        }

+

+        // set HTTP version

+        switch ($this->request->getConfig('protocol_version')) {

+            case '1.0':

+                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);

+                break;

+            case '1.1':

+                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

+        }

+

+        // set request method

+        switch ($this->request->getMethod()) {

+            case HTTP_Request2::METHOD_GET:

+                curl_setopt($ch, CURLOPT_HTTPGET, true);

+                break;

+            case HTTP_Request2::METHOD_POST:

+                curl_setopt($ch, CURLOPT_POST, true);

+                break;

+            default:

+                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());

+        }

+

+        // set proxy, if needed

+        if ($host = $this->request->getConfig('proxy_host')) {

+            if (!($port = $this->request->getConfig('proxy_port'))) {

+                throw new HTTP_Request2_Exception('Proxy port not provided');

+            }

+            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);

+            if ($user = $this->request->getConfig('proxy_user')) {

+                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user . ':' .

+                            $this->request->getConfig('proxy_password'));

+                switch ($this->request->getConfig('proxy_auth_scheme')) {

+                    case HTTP_Request2::AUTH_BASIC:

+                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);

+                        break;

+                    case HTTP_Request2::AUTH_DIGEST:

+                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);

+                }

+            }

+        }

+

+        // set authentication data

+        if ($auth = $this->request->getAuth()) {

+            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);

+            switch ($auth['scheme']) {

+                case HTTP_Request2::AUTH_BASIC:

+                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

+                    break;

+                case HTTP_Request2::AUTH_DIGEST:

+                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);

+            }

+        }

+

+        // set SSL options

+        if (0 == strcasecmp($this->request->getUrl()->getScheme(), 'https')) {

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

+                if ('ssl_verify_host' == $name && null !== $value) {

+                    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);

+                } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {

+                    curl_setopt($ch, self::$sslContextMap[$name], $value);

+                }

+            }

+        }

+

+        $headers = $this->request->getHeaders();

+        // make cURL automagically send proper header

+        if (!isset($headers['accept-encoding'])) {

+            $headers['accept-encoding'] = '';

+        }

+

+        // set headers having special cURL keys

+        foreach (self::$headerMap as $name => $option) {

+            if (isset($headers[$name])) {

+                curl_setopt($ch, $option, $headers[$name]);

+                unset($headers[$name]);

+            }

+        }

+

+        $this->calculateRequestLength($headers);

+

+        // set headers not having special keys

+        $headersFmt = array();

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

+            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

+            $headersFmt[]  = $canonicalName . ': ' . $value;

+        }

+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);

+

+        return $ch;

+    }

+

+   /**

+    * Callback function called by cURL for reading the request body

+    *

+    * @param    resource    cURL handle

+    * @param    resource    file descriptor (not used)

+    * @param    integer     maximum length of data to return

+    * @return   string      part of the request body, up to $length bytes 

+    */

+    protected function callbackReadBody($ch, $fd, $length)

+    {

+        if (!$this->eventSentHeaders) {

+            $this->request->setLastEvent(

+                'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

+            );

+            $this->eventSentHeaders = true;

+        }

+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||

+            0 == $this->contentLength || $this->position >= $this->contentLength

+        ) {

+            return '';

+        }

+        if (is_string($this->requestBody)) {

+            $string = substr($this->requestBody, $this->position, $length);

+        } elseif (is_resource($this->requestBody)) {

+            $string = fread($this->requestBody, $length);

+        } else {

+            $string = $this->requestBody->read($length);

+        }

+        $this->request->setLastEvent('sentBodyPart', strlen($string));

+        $this->position += strlen($string);

+        return $string;

+    }

+

+   /**

+    * Callback function called by cURL for saving the response headers

+    *

+    * @param    resource    cURL handle

+    * @param    string      response header (with trailing CRLF)

+    * @return   integer     number of bytes saved

+    * @see      HTTP_Request2_Response::parseHeaderLine()

+    */

+    protected function callbackWriteHeader($ch, $string)

+    {

+        // we may receive a second set of headers if doing e.g. digest auth

+        if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {

+            // don't bother with 100-Continue responses (bug #15785)

+            if (!$this->eventSentHeaders ||

+                $this->response->getStatus() >= 200

+            ) {

+                $this->request->setLastEvent(

+                    'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

+                );

+            }

+            $this->eventSentHeaders = true;

+            // we'll need a new response object

+            if ($this->eventReceivedHeaders) {

+                $this->eventReceivedHeaders = false;

+                $this->response             = null;

+            }

+        }

+        if (empty($this->response)) {

+            $this->response = new HTTP_Request2_Response($string, false);

+        } else {

+            $this->response->parseHeaderLine($string);

+            if ('' == trim($string)) {

+                // don't bother with 100-Continue responses (bug #15785)

+                if (200 <= $this->response->getStatus()) {

+                    $this->request->setLastEvent('receivedHeaders', $this->response);

+                }

+                $this->eventReceivedHeaders = true;

+            }

+        }

+        return strlen($string);

+    }

+

+   /**

+    * Callback function called by cURL for saving the response body

+    *

+    * @param    resource    cURL handle (not used)

+    * @param    string      part of the response body

+    * @return   integer     number of bytes saved

+    * @see      HTTP_Request2_Response::appendBody()

+    */

+    protected function callbackWriteBody($ch, $string)

+    {

+        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if 

+        // response doesn't start with proper HTTP status line (see bug #15716)

+        if (empty($this->response)) {

+            throw new HTTP_Request2_Exception("Malformed response: {$string}");

+        }

+        if ($this->request->getConfig('store_body')) {

+            $this->response->appendBody($string);

+        }

+        $this->request->setLastEvent('receivedBodyPart', $string);

+        return strlen($string);

+    }

+}

+?>

diff --git a/extlib/HTTP/Request2/Adapter/Mock.php b/extlib/HTTP/Request2/Adapter/Mock.php
new file mode 100644
index 000000000..89688003b
--- /dev/null
+++ b/extlib/HTTP/Request2/Adapter/Mock.php
@@ -0,0 +1,171 @@
+<?php

+/**

+ * Mock adapter intended for testing

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Mock.php 274406 2009-01-23 18:01:57Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Base class for HTTP_Request2 adapters

+ */

+require_once 'HTTP/Request2/Adapter.php';

+

+/**

+ * Mock adapter intended for testing

+ *

+ * Can be used to test applications depending on HTTP_Request2 package without

+ * actually performing any HTTP requests. This adapter will return responses

+ * previously added via addResponse()

+ * <code>

+ * $mock = new HTTP_Request2_Adapter_Mock();

+ * $mock->addResponse("HTTP/1.1 ... ");

+ * 

+ * $request = new HTTP_Request2();

+ * $request->setAdapter($mock);

+ * 

+ * // This will return the response set above

+ * $response = $req->send();

+ * </code> 

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @version    Release: 0.4.1

+ */

+class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter

+{

+   /**

+    * A queue of responses to be returned by sendRequest()

+    * @var  array 

+    */

+    protected $responses = array();

+

+   /**

+    * Returns the next response from the queue built by addResponse()

+    *

+    * If the queue is empty will return default empty response with status 400,

+    * if an Exception object was added to the queue it will be thrown.

+    *

+    * @param    HTTP_Request2

+    * @return   HTTP_Request2_Response

+    * @throws   Exception

+    */

+    public function sendRequest(HTTP_Request2 $request)

+    {

+        if (count($this->responses) > 0) {

+            $response = array_shift($this->responses);

+            if ($response instanceof HTTP_Request2_Response) {

+                return $response;

+            } else {

+                // rethrow the exception,

+                $class   = get_class($response);

+                $message = $response->getMessage();

+                $code    = $response->getCode();

+                throw new $class($message, $code);

+            }

+        } else {

+            return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");

+        }

+    }

+

+   /**

+    * Adds response to the queue

+    *

+    * @param    mixed   either a string, a pointer to an open file,

+    *                   a HTTP_Request2_Response or Exception object

+    * @throws   HTTP_Request2_Exception

+    */

+    public function addResponse($response)

+    {

+        if (is_string($response)) {

+            $response = self::createResponseFromString($response);

+        } elseif (is_resource($response)) {

+            $response = self::createResponseFromFile($response);

+        } elseif (!$response instanceof HTTP_Request2_Response &&

+                  !$response instanceof Exception

+        ) {

+            throw new HTTP_Request2_Exception('Parameter is not a valid response');

+        }

+        $this->responses[] = $response;

+    }

+

+   /**

+    * Creates a new HTTP_Request2_Response object from a string

+    *

+    * @param    string

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    public static function createResponseFromString($str)

+    {

+        $parts       = preg_split('!(\r?\n){2}!m', $str, 2);

+        $headerLines = explode("\n", $parts[0]); 

+        $response    = new HTTP_Request2_Response(array_shift($headerLines));

+        foreach ($headerLines as $headerLine) {

+            $response->parseHeaderLine($headerLine);

+        }

+        $response->parseHeaderLine('');

+        if (isset($parts[1])) {

+            $response->appendBody($parts[1]);

+        }

+        return $response;

+    }

+

+   /**

+    * Creates a new HTTP_Request2_Response object from a file

+    *

+    * @param    resource    file pointer returned by fopen()

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    public static function createResponseFromFile($fp)

+    {

+        $response = new HTTP_Request2_Response(fgets($fp));

+        do {

+            $headerLine = fgets($fp);

+            $response->parseHeaderLine($headerLine);

+        } while ('' != trim($headerLine));

+

+        while (!feof($fp)) {

+            $response->appendBody(fread($fp, 8192));

+        }

+        return $response;

+    }

+}

+?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/Adapter/Socket.php b/extlib/HTTP/Request2/Adapter/Socket.php
new file mode 100644
index 000000000..ff44d4959
--- /dev/null
+++ b/extlib/HTTP/Request2/Adapter/Socket.php
@@ -0,0 +1,971 @@
+<?php

+/**

+ * Socket-based adapter for HTTP_Request2

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Socket.php 279760 2009-05-03 10:46:42Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Base class for HTTP_Request2 adapters

+ */

+require_once 'HTTP/Request2/Adapter.php';

+

+/**

+ * Socket-based adapter for HTTP_Request2

+ *

+ * This adapter uses only PHP sockets and will work on almost any PHP

+ * environment. Code is based on original HTTP_Request PEAR package.

+ *

+ * @category    HTTP

+ * @package     HTTP_Request2

+ * @author      Alexey Borzov <avb@php.net>

+ * @version     Release: 0.4.1

+ */

+class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter

+{

+   /**

+    * Regular expression for 'token' rule from RFC 2616

+    */ 

+    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';

+

+   /**

+    * Regular expression for 'quoted-string' rule from RFC 2616

+    */

+    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';

+

+   /**

+    * Connected sockets, needed for Keep-Alive support

+    * @var  array

+    * @see  connect()

+    */

+    protected static $sockets = array();

+

+   /**

+    * Data for digest authentication scheme

+    *

+    * The keys for the array are URL prefixes. 

+    *

+    * The values are associative arrays with data (realm, nonce, nonce-count, 

+    * opaque...) needed for digest authentication. Stored here to prevent making 

+    * duplicate requests to digest-protected resources after we have already 

+    * received the challenge.

+    *

+    * @var  array

+    */

+    protected static $challenges = array();

+

+   /**

+    * Connected socket

+    * @var  resource

+    * @see  connect()

+    */

+    protected $socket;

+

+   /**

+    * Challenge used for server digest authentication

+    * @var  array

+    */

+    protected $serverChallenge;

+

+   /**

+    * Challenge used for proxy digest authentication

+    * @var  array

+    */

+    protected $proxyChallenge;

+

+   /**

+    * Global timeout, exception will be raised if request continues past this time

+    * @var  integer

+    */

+    protected $timeout = null;

+

+   /**

+    * Remaining length of the current chunk, when reading chunked response

+    * @var  integer

+    * @see  readChunked()

+    */ 

+    protected $chunkLength = 0;

+

+   /**

+    * Sends request to the remote server and returns its response

+    *

+    * @param    HTTP_Request2

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    public function sendRequest(HTTP_Request2 $request)

+    {

+        $this->request = $request;

+        $keepAlive     = $this->connect();

+        $headers       = $this->prepareHeaders();

+

+        // Use global request timeout if given, see feature requests #5735, #8964 

+        if ($timeout = $request->getConfig('timeout')) {

+            $this->timeout = time() + $timeout;

+        } else {

+            $this->timeout = null;

+        }

+

+        try {

+            if (false === @fwrite($this->socket, $headers, strlen($headers))) {

+                throw new HTTP_Request2_Exception('Error writing request');

+            }

+            // provide request headers to the observer, see request #7633

+            $this->request->setLastEvent('sentHeaders', $headers);

+            $this->writeBody();

+

+            if ($this->timeout && time() > $this->timeout) {

+                throw new HTTP_Request2_Exception(

+                    'Request timed out after ' . 

+                    $request->getConfig('timeout') . ' second(s)'

+                );

+            }

+

+            $response = $this->readResponse();

+

+            if (!$this->canKeepAlive($keepAlive, $response)) {

+                $this->disconnect();

+            }

+

+            if ($this->shouldUseProxyDigestAuth($response)) {

+                return $this->sendRequest($request);

+            }

+            if ($this->shouldUseServerDigestAuth($response)) {

+                return $this->sendRequest($request);

+            }

+            if ($authInfo = $response->getHeader('authentication-info')) {

+                $this->updateChallenge($this->serverChallenge, $authInfo);

+            }

+            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {

+                $this->updateChallenge($this->proxyChallenge, $proxyInfo);

+            }

+

+        } catch (Exception $e) {

+            $this->disconnect();

+            throw $e;

+        }

+

+        return $response;

+    }

+

+   /**

+    * Connects to the remote server

+    *

+    * @return   bool    whether the connection can be persistent

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function connect()

+    {

+        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');

+        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();

+        $headers = $this->request->getHeaders();

+        $reqHost = $this->request->getUrl()->getHost();

+        if (!($reqPort = $this->request->getUrl()->getPort())) {

+            $reqPort = $secure? 443: 80;

+        }

+

+        if ($host = $this->request->getConfig('proxy_host')) {

+            if (!($port = $this->request->getConfig('proxy_port'))) {

+                throw new HTTP_Request2_Exception('Proxy port not provided');

+            }

+            $proxy = true;

+        } else {

+            $host  = $reqHost;

+            $port  = $reqPort;

+            $proxy = false;

+        }

+

+        if ($tunnel && !$proxy) {

+            throw new HTTP_Request2_Exception(

+                "Trying to perform CONNECT request without proxy"

+            );

+        }

+        if ($secure && !in_array('ssl', stream_get_transports())) {

+            throw new HTTP_Request2_Exception(

+                'Need OpenSSL support for https:// requests'

+            );

+        }

+

+        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive

+        // connection token to a proxy server...

+        if ($proxy && !$secure && 

+            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']

+        ) {

+            $this->request->setHeader('connection');

+        }

+

+        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') && 

+                      empty($headers['connection'])) ||

+                     (!empty($headers['connection']) &&

+                      'Keep-Alive' == $headers['connection']);

+        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;

+

+        $options = array();

+        if ($secure || $tunnel) {

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

+                if ('ssl_' == substr($name, 0, 4) && null !== $value) {

+                    if ('ssl_verify_host' == $name) {

+                        if ($value) {

+                            $options['CN_match'] = $reqHost;

+                        }

+                    } else {

+                        $options[substr($name, 4)] = $value;

+                    }

+                }

+            }

+            ksort($options);

+        }

+

+        // Changing SSL context options after connection is established does *not*

+        // work, we need a new connection if options change

+        $remote    = $host . ':' . $port;

+        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .

+                     (empty($options)? '': ':' . serialize($options));

+        unset($this->socket);

+

+        // We use persistent connections and have a connected socket?

+        // Ensure that the socket is still connected, see bug #16149

+        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&

+            !feof(self::$sockets[$socketKey])

+        ) {

+            $this->socket =& self::$sockets[$socketKey];

+

+        } elseif ($secure && $proxy && !$tunnel) {

+            $this->establishTunnel();

+            $this->request->setLastEvent(

+                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"

+            );

+            self::$sockets[$socketKey] =& $this->socket;

+

+        } else {

+            // Set SSL context options if doing HTTPS request or creating a tunnel

+            $context = stream_context_create();

+            foreach ($options as $name => $value) {

+                if (!stream_context_set_option($context, 'ssl', $name, $value)) {

+                    throw new HTTP_Request2_Exception(

+                        "Error setting SSL context option '{$name}'"

+                    );

+                }

+            }

+            $this->socket = @stream_socket_client(

+                $remote, $errno, $errstr,

+                $this->request->getConfig('connect_timeout'),

+                STREAM_CLIENT_CONNECT, $context

+            );

+            if (!$this->socket) {

+                throw new HTTP_Request2_Exception(

+                    "Unable to connect to {$remote}. Error #{$errno}: {$errstr}"

+                );

+            }

+            $this->request->setLastEvent('connect', $remote);

+            self::$sockets[$socketKey] =& $this->socket;

+        }

+        return $keepAlive;

+    }

+

+   /**

+    * Establishes a tunnel to a secure remote server via HTTP CONNECT request

+    *

+    * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP

+    * sees that we are connected to a proxy server (duh!) rather than the server

+    * that presents its certificate.

+    *

+    * @link     http://tools.ietf.org/html/rfc2817#section-5.2

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function establishTunnel()

+    {

+        $donor   = new self;

+        $connect = new HTTP_Request2(

+            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,

+            array_merge($this->request->getConfig(),

+                        array('adapter' => $donor))

+        );

+        $response = $connect->send();

+        // Need any successful (2XX) response

+        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {

+            throw new HTTP_Request2_Exception(

+                'Failed to connect via HTTPS proxy. Proxy response: ' .

+                $response->getStatus() . ' ' . $response->getReasonPhrase()

+            );

+        }

+        $this->socket = $donor->socket;

+

+        $modes = array(

+            STREAM_CRYPTO_METHOD_TLS_CLIENT, 

+            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,

+            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,

+            STREAM_CRYPTO_METHOD_SSLv2_CLIENT 

+        );

+

+        foreach ($modes as $mode) {

+            if (stream_socket_enable_crypto($this->socket, true, $mode)) {

+                return;

+            }

+        }

+        throw new HTTP_Request2_Exception(

+            'Failed to enable secure connection when connecting through proxy'

+        );

+    }

+

+   /**

+    * Checks whether current connection may be reused or should be closed

+    *

+    * @param    boolean                 whether connection could be persistent 

+    *                                   in the first place

+    * @param    HTTP_Request2_Response  response object to check

+    * @return   boolean

+    */

+    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)

+    {

+        // Do not close socket on successful CONNECT request

+        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&

+            200 <= $response->getStatus() && 300 > $response->getStatus()

+        ) {

+            return true;

+        }

+

+        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||

+                       null !== $response->getHeader('content-length');

+        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||

+                       (null === $response->getHeader('connection') &&

+                        '1.1' == $response->getVersion());

+        return $requestKeepAlive && $lengthKnown && $persistent;

+    }

+

+   /**

+    * Disconnects from the remote server

+    */

+    protected function disconnect()

+    {

+        if (is_resource($this->socket)) {

+            fclose($this->socket);

+            $this->socket = null;

+            $this->request->setLastEvent('disconnect');

+        }

+    }

+

+   /**

+    * Checks whether another request should be performed with server digest auth

+    *

+    * Several conditions should be satisfied for it to return true:

+    *   - response status should be 401

+    *   - auth credentials should be set in the request object

+    *   - response should contain WWW-Authenticate header with digest challenge

+    *   - there is either no challenge stored for this URL or new challenge

+    *     contains stale=true parameter (in other case we probably just failed 

+    *     due to invalid username / password)

+    *

+    * The method stores challenge values in $challenges static property

+    *

+    * @param    HTTP_Request2_Response  response to check

+    * @return   boolean whether another request should be performed

+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

+    */

+    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)

+    {

+        // no sense repeating a request if we don't have credentials

+        if (401 != $response->getStatus() || !$this->request->getAuth()) {

+            return false;

+        }

+        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {

+            return false;

+        }

+

+        $url    = $this->request->getUrl();

+        $scheme = $url->getScheme();

+        $host   = $scheme . '://' . $url->getHost();

+        if ($port = $url->getPort()) {

+            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||

+                (0 == strcasecmp($scheme, 'https') && 443 != $port)

+            ) {

+                $host .= ':' . $port;

+            }

+        }

+

+        if (!empty($challenge['domain'])) {

+            $prefixes = array();

+            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {

+                // don't bother with different servers

+                if ('/' == substr($prefix, 0, 1)) {

+                    $prefixes[] = $host . $prefix;

+                }

+            }

+        }

+        if (empty($prefixes)) {

+            $prefixes = array($host . '/');

+        }

+

+        $ret = true;

+        foreach ($prefixes as $prefix) {

+            if (!empty(self::$challenges[$prefix]) &&

+                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))

+            ) {

+                // probably credentials are invalid

+                $ret = false;

+            }

+            self::$challenges[$prefix] =& $challenge;

+        }

+        return $ret;

+    }

+

+   /**

+    * Checks whether another request should be performed with proxy digest auth

+    *

+    * Several conditions should be satisfied for it to return true:

+    *   - response status should be 407

+    *   - proxy auth credentials should be set in the request object

+    *   - response should contain Proxy-Authenticate header with digest challenge

+    *   - there is either no challenge stored for this proxy or new challenge

+    *     contains stale=true parameter (in other case we probably just failed 

+    *     due to invalid username / password)

+    *

+    * The method stores challenge values in $challenges static property

+    *

+    * @param    HTTP_Request2_Response  response to check

+    * @return   boolean whether another request should be performed

+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

+    */

+    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)

+    {

+        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {

+            return false;

+        }

+        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {

+            return false;

+        }

+

+        $key = 'proxy://' . $this->request->getConfig('proxy_host') .

+               ':' . $this->request->getConfig('proxy_port');

+

+        if (!empty(self::$challenges[$key]) &&

+            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))

+        ) {

+            $ret = false;

+        } else {

+            $ret = true;

+        }

+        self::$challenges[$key] = $challenge;

+        return $ret;

+    }

+

+   /**

+    * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value

+    *

+    * There is a problem with implementation of RFC 2617: several of the parameters

+    * here are defined as quoted-string and thus may contain backslash escaped

+    * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as

+    * just value of quoted-string X without surrounding quotes, it doesn't speak

+    * about removing backslash escaping.

+    *

+    * Now realm parameter is user-defined and human-readable, strange things

+    * happen when it contains quotes:

+    *   - Apache allows quotes in realm, but apparently uses realm value without

+    *     backslashes for digest computation

+    *   - Squid allows (manually escaped) quotes there, but it is impossible to

+    *     authorize with either escaped or unescaped quotes used in digest,

+    *     probably it can't parse the response (?)

+    *   - Both IE and Firefox display realm value with backslashes in 

+    *     the password popup and apparently use the same value for digest

+    *

+    * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in

+    * quoted-string handling, unfortunately that means failure to authorize 

+    * sometimes

+    *

+    * @param    string  value of WWW-Authenticate or Proxy-Authenticate header

+    * @return   mixed   associative array with challenge parameters, false if

+    *                   no challenge is present in header value

+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

+    */

+    protected function parseDigestChallenge($headerValue)

+    {

+        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .

+                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';

+        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";

+        if (!preg_match($challenge, $headerValue, $matches)) {

+            return false;

+        }

+

+        preg_match_all('!' . $authParam . '!', $matches[0], $params);

+        $paramsAry   = array();

+        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',

+                             'algorithm', 'qop');

+        for ($i = 0; $i < count($params[0]); $i++) {

+            // section 3.2.1: Any unrecognized directive MUST be ignored.

+            if (in_array($params[1][$i], $knownParams)) {

+                if ('"' == substr($params[2][$i], 0, 1)) {

+                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);

+                } else {

+                    $paramsAry[$params[1][$i]] = $params[2][$i];

+                }

+            }

+        }

+        // we only support qop=auth

+        if (!empty($paramsAry['qop']) && 

+            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))

+        ) {

+            throw new HTTP_Request2_Exception(

+                "Only 'auth' qop is currently supported in digest authentication, " .

+                "server requested '{$paramsAry['qop']}'"

+            );

+        }

+        // we only support algorithm=MD5

+        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {

+            throw new HTTP_Request2_Exception(

+                "Only 'MD5' algorithm is currently supported in digest authentication, " .

+                "server requested '{$paramsAry['algorithm']}'"

+            );

+        }

+

+        return $paramsAry; 

+    }

+

+   /**

+    * Parses [Proxy-]Authentication-Info header value and updates challenge

+    *

+    * @param    array   challenge to update

+    * @param    string  value of [Proxy-]Authentication-Info header

+    * @todo     validate server rspauth response

+    */ 

+    protected function updateChallenge(&$challenge, $headerValue)

+    {

+        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .

+                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';

+        $paramsAry   = array();

+

+        preg_match_all($authParam, $headerValue, $params);

+        for ($i = 0; $i < count($params[0]); $i++) {

+            if ('"' == substr($params[2][$i], 0, 1)) {

+                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);

+            } else {

+                $paramsAry[$params[1][$i]] = $params[2][$i];

+            }

+        }

+        // for now, just update the nonce value

+        if (!empty($paramsAry['nextnonce'])) {

+            $challenge['nonce'] = $paramsAry['nextnonce'];

+            $challenge['nc']    = 1;

+        }

+    }

+

+   /**

+    * Creates a value for [Proxy-]Authorization header when using digest authentication

+    *

+    * @param    string  user name

+    * @param    string  password

+    * @param    string  request URL

+    * @param    array   digest challenge parameters

+    * @return   string  value of [Proxy-]Authorization request header

+    * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2

+    */ 

+    protected function createDigestResponse($user, $password, $url, &$challenge)

+    {

+        if (false !== ($q = strpos($url, '?')) && 

+            $this->request->getConfig('digest_compat_ie')

+        ) {

+            $url = substr($url, 0, $q);

+        }

+

+        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);

+        $a2 = md5($this->request->getMethod() . ':' . $url);

+

+        if (empty($challenge['qop'])) {

+            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);

+        } else {

+            $challenge['cnonce'] = 'Req2.' . rand();

+            if (empty($challenge['nc'])) {

+                $challenge['nc'] = 1;

+            }

+            $nc     = sprintf('%08x', $challenge['nc']++);

+            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .

+                          $challenge['cnonce'] . ':auth:' . $a2);

+        }

+        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .

+               'realm="' . $challenge['realm'] . '", ' .

+               'nonce="' . $challenge['nonce'] . '", ' .

+               'uri="' . $url . '", ' .

+               'response="' . $digest . '"' .

+               (!empty($challenge['opaque'])? 

+                ', opaque="' . $challenge['opaque'] . '"':

+                '') .

+               (!empty($challenge['qop'])?

+                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':

+                '');

+    }

+

+   /**

+    * Adds 'Authorization' header (if needed) to request headers array

+    *

+    * @param    array   request headers

+    * @param    string  request host (needed for digest authentication)

+    * @param    string  request URL (needed for digest authentication)

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)

+    {

+        if (!($auth = $this->request->getAuth())) {

+            return;

+        }

+        switch ($auth['scheme']) {

+            case HTTP_Request2::AUTH_BASIC:

+                $headers['authorization'] = 

+                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);

+                break;

+

+            case HTTP_Request2::AUTH_DIGEST:

+                unset($this->serverChallenge);

+                $fullUrl = ('/' == $requestUrl[0])?

+                           $this->request->getUrl()->getScheme() . '://' .

+                            $requestHost . $requestUrl:

+                           $requestUrl;

+                foreach (array_keys(self::$challenges) as $key) {

+                    if ($key == substr($fullUrl, 0, strlen($key))) {

+                        $headers['authorization'] = $this->createDigestResponse(

+                            $auth['user'], $auth['password'], 

+                            $requestUrl, self::$challenges[$key]

+                        );

+                        $this->serverChallenge =& self::$challenges[$key];

+                        break;

+                    }

+                }

+                break;

+

+            default:

+                throw new HTTP_Request2_Exception(

+                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"

+                );

+        }

+    }

+

+   /**

+    * Adds 'Proxy-Authorization' header (if needed) to request headers array

+    *

+    * @param    array   request headers

+    * @param    string  request URL (needed for digest authentication)

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)

+    {

+        if (!$this->request->getConfig('proxy_host') ||

+            !($user = $this->request->getConfig('proxy_user')) ||

+            (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&

+             HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())

+        ) {

+            return;

+        }

+

+        $password = $this->request->getConfig('proxy_password');

+        switch ($this->request->getConfig('proxy_auth_scheme')) {

+            case HTTP_Request2::AUTH_BASIC:

+                $headers['proxy-authorization'] =

+                    'Basic ' . base64_encode($user . ':' . $password);

+                break;

+

+            case HTTP_Request2::AUTH_DIGEST:

+                unset($this->proxyChallenge);

+                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .

+                            ':' . $this->request->getConfig('proxy_port');

+                if (!empty(self::$challenges[$proxyUrl])) {

+                    $headers['proxy-authorization'] = $this->createDigestResponse(

+                        $user, $password,

+                        $requestUrl, self::$challenges[$proxyUrl]

+                    );

+                    $this->proxyChallenge =& self::$challenges[$proxyUrl];

+                }

+                break;

+

+            default:

+                throw new HTTP_Request2_Exception(

+                    "Unknown HTTP authentication scheme '" .

+                    $this->request->getConfig('proxy_auth_scheme') . "'"

+                );

+        }

+    }

+

+

+   /**

+    * Creates the string with the Request-Line and request headers

+    *

+    * @return   string

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function prepareHeaders()

+    {

+        $headers = $this->request->getHeaders();

+        $url     = $this->request->getUrl();

+        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();

+        $host    = $url->getHost();

+

+        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;

+        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {

+            $host .= ':' . (empty($port)? $defaultPort: $port);

+        }

+        // Do not overwrite explicitly set 'Host' header, see bug #16146

+        if (!isset($headers['host'])) {

+            $headers['host'] = $host;

+        }

+

+        if ($connect) {

+            $requestUrl = $host;

+

+        } else {

+            if (!$this->request->getConfig('proxy_host') ||

+                0 == strcasecmp($url->getScheme(), 'https')

+            ) {

+                $requestUrl = '';

+            } else {

+                $requestUrl = $url->getScheme() . '://' . $host;

+            }

+            $path        = $url->getPath();

+            $query       = $url->getQuery();

+            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);

+        }

+

+        if ('1.1' == $this->request->getConfig('protocol_version') &&

+            extension_loaded('zlib') && !isset($headers['accept-encoding'])

+        ) {

+            $headers['accept-encoding'] = 'gzip, deflate';

+        }

+

+        $this->addAuthorizationHeader($headers, $host, $requestUrl);

+        $this->addProxyAuthorizationHeader($headers, $requestUrl);

+        $this->calculateRequestLength($headers);

+

+        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .

+                      $this->request->getConfig('protocol_version') . "\r\n";

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

+            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

+            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";

+        }

+        return $headersStr . "\r\n";

+    }

+

+   /**

+    * Sends the request body

+    *

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function writeBody()

+    {

+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||

+            0 == $this->contentLength

+        ) {

+            return;

+        }

+

+        $position   = 0;

+        $bufferSize = $this->request->getConfig('buffer_size');

+        while ($position < $this->contentLength) {

+            if (is_string($this->requestBody)) {

+                $str = substr($this->requestBody, $position, $bufferSize);

+            } elseif (is_resource($this->requestBody)) {

+                $str = fread($this->requestBody, $bufferSize);

+            } else {

+                $str = $this->requestBody->read($bufferSize);

+            }

+            if (false === @fwrite($this->socket, $str, strlen($str))) {

+                throw new HTTP_Request2_Exception('Error writing request');

+            }

+            // Provide the length of written string to the observer, request #7630

+            $this->request->setLastEvent('sentBodyPart', strlen($str));

+            $position += strlen($str); 

+        }

+    }

+

+   /**

+    * Reads the remote server's response

+    *

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function readResponse()

+    {

+        $bufferSize = $this->request->getConfig('buffer_size');

+

+        do {

+            $response = new HTTP_Request2_Response($this->readLine($bufferSize), true);

+            do {

+                $headerLine = $this->readLine($bufferSize);

+                $response->parseHeaderLine($headerLine);

+            } while ('' != $headerLine);

+        } while (in_array($response->getStatus(), array(100, 101)));

+

+        $this->request->setLastEvent('receivedHeaders', $response);

+

+        // No body possible in such responses

+        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||

+            (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&

+             200 <= $response->getStatus() && 300 > $response->getStatus()) ||

+            in_array($response->getStatus(), array(204, 304))

+        ) {

+            return $response;

+        }

+

+        $chunked = 'chunked' == $response->getHeader('transfer-encoding');

+        $length  = $response->getHeader('content-length');

+        $hasBody = false;

+        if ($chunked || null === $length || 0 < intval($length)) {

+            // RFC 2616, section 4.4:

+            // 3. ... If a message is received with both a

+            // Transfer-Encoding header field and a Content-Length header field,

+            // the latter MUST be ignored.

+            $toRead = ($chunked || null === $length)? null: $length;

+            $this->chunkLength = 0;

+

+            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {

+                if ($chunked) {

+                    $data = $this->readChunked($bufferSize);

+                } elseif (is_null($toRead)) {

+                    $data = $this->fread($bufferSize);

+                } else {

+                    $data    = $this->fread(min($toRead, $bufferSize));

+                    $toRead -= strlen($data);

+                }

+                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {

+                    break;

+                }

+

+                $hasBody = true;

+                if ($this->request->getConfig('store_body')) {

+                    $response->appendBody($data);

+                }

+                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {

+                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);

+                } else {

+                    $this->request->setLastEvent('receivedBodyPart', $data);

+                }

+            }

+        }

+

+        if ($hasBody) {

+            $this->request->setLastEvent('receivedBody', $response);

+        }

+        return $response;

+    }

+

+   /**

+    * Reads until either the end of the socket or a newline, whichever comes first 

+    *

+    * Strips the trailing newline from the returned data, handles global 

+    * request timeout. Method idea borrowed from Net_Socket PEAR package. 

+    *

+    * @param    int     buffer size to use for reading

+    * @return   Available data up to the newline (not including newline)

+    * @throws   HTTP_Request2_Exception     In case of timeout

+    */

+    protected function readLine($bufferSize)

+    {

+        $line = '';

+        while (!feof($this->socket)) {

+            if ($this->timeout) {

+                stream_set_timeout($this->socket, max($this->timeout - time(), 1));

+            }

+            $line .= @fgets($this->socket, $bufferSize);

+            $info  = stream_get_meta_data($this->socket);

+            if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {

+                throw new HTTP_Request2_Exception(

+                    'Request timed out after ' . 

+                    $this->request->getConfig('timeout') . ' second(s)'

+                );

+            }

+            if (substr($line, -1) == "\n") {

+                return rtrim($line, "\r\n");

+            }

+        }

+        return $line;

+    }

+

+   /**

+    * Wrapper around fread(), handles global request timeout

+    *

+    * @param    int     Reads up to this number of bytes

+    * @return   Data read from socket

+    * @throws   HTTP_Request2_Exception     In case of timeout

+    */

+    protected function fread($length)

+    {

+        if ($this->timeout) {

+            stream_set_timeout($this->socket, max($this->timeout - time(), 1));

+        }

+        $data = fread($this->socket, $length);

+        $info = stream_get_meta_data($this->socket);

+        if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {

+            throw new HTTP_Request2_Exception(

+                'Request timed out after ' . 

+                $this->request->getConfig('timeout') . ' second(s)'

+            );

+        }

+        return $data;

+    }

+

+   /**

+    * Reads a part of response body encoded with chunked Transfer-Encoding

+    *

+    * @param    int     buffer size to use for reading

+    * @return   string

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function readChunked($bufferSize)

+    {

+        // at start of the next chunk?

+        if (0 == $this->chunkLength) {

+            $line = $this->readLine($bufferSize);

+            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {

+                throw new HTTP_Request2_Exception(

+                    "Cannot decode chunked response, invalid chunk length '{$line}'"

+                );

+            } else {

+                $this->chunkLength = hexdec($matches[1]);

+                // Chunk with zero length indicates the end

+                if (0 == $this->chunkLength) {

+                    $this->readLine($bufferSize);

+                    return '';

+                }

+            }

+        }

+        $data = $this->fread(min($this->chunkLength, $bufferSize));

+        $this->chunkLength -= strlen($data);

+        if (0 == $this->chunkLength) {

+            $this->readLine($bufferSize); // Trailing CRLF

+        }

+        return $data;

+    }

+}

+

+?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/Exception.php b/extlib/HTTP/Request2/Exception.php
new file mode 100644
index 000000000..bfef7d6c2
--- /dev/null
+++ b/extlib/HTTP/Request2/Exception.php
@@ -0,0 +1,62 @@
+<?php

+/**

+ * Exception class for HTTP_Request2 package

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Exception.php 273003 2009-01-07 19:28:22Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Base class for exceptions in PEAR

+ */

+require_once 'PEAR/Exception.php';

+

+/**

+ * Exception class for HTTP_Request2 package

+ *

+ * Such a class is required by the Exception RFC:

+ * http://pear.php.net/pepr/pepr-proposal-show.php?id=132

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @version    Release: 0.4.1

+ */

+class HTTP_Request2_Exception extends PEAR_Exception

+{

+}

+?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/MultipartBody.php b/extlib/HTTP/Request2/MultipartBody.php
new file mode 100644
index 000000000..d8afd8344
--- /dev/null
+++ b/extlib/HTTP/Request2/MultipartBody.php
@@ -0,0 +1,274 @@
+<?php

+/**

+ * Helper class for building multipart/form-data request body

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: MultipartBody.php 287306 2009-08-14 15:22:52Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Class for building multipart/form-data request body

+ *

+ * The class helps to reduce memory consumption by streaming large file uploads

+ * from disk, it also allows monitoring of upload progress (see request #7630)

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @version    Release: 0.4.1

+ * @link       http://tools.ietf.org/html/rfc1867

+ */

+class HTTP_Request2_MultipartBody

+{

+   /**

+    * MIME boundary

+    * @var  string

+    */

+    private $_boundary;

+

+   /**

+    * Form parameters added via {@link HTTP_Request2::addPostParameter()}

+    * @var  array

+    */

+    private $_params = array();

+

+   /**

+    * File uploads added via {@link HTTP_Request2::addUpload()}

+    * @var  array

+    */

+    private $_uploads = array();

+

+   /**

+    * Header for parts with parameters

+    * @var  string

+    */

+    private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";

+

+   /**

+    * Header for parts with uploads

+    * @var  string

+    */

+    private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";

+

+   /**

+    * Current position in parameter and upload arrays

+    *

+    * First number is index of "current" part, second number is position within

+    * "current" part

+    *

+    * @var  array

+    */

+    private $_pos = array(0, 0);

+

+

+   /**

+    * Constructor. Sets the arrays with POST data.

+    *

+    * @param    array   values of form fields set via {@link HTTP_Request2::addPostParameter()}

+    * @param    array   file uploads set via {@link HTTP_Request2::addUpload()}

+    * @param    bool    whether to append brackets to array variable names

+    */

+    public function __construct(array $params, array $uploads, $useBrackets = true)

+    {

+        $this->_params = self::_flattenArray('', $params, $useBrackets);

+        foreach ($uploads as $fieldName => $f) {

+            if (!is_array($f['fp'])) {

+                $this->_uploads[] = $f + array('name' => $fieldName);

+            } else {

+                for ($i = 0; $i < count($f['fp']); $i++) {

+                    $upload = array(

+                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)

+                    );

+                    foreach (array('fp', 'filename', 'size', 'type') as $key) {

+                        $upload[$key] = $f[$key][$i];

+                    }

+                    $this->_uploads[] = $upload;

+                }

+            }

+        }

+    }

+

+   /**

+    * Returns the length of the body to use in Content-Length header

+    *

+    * @return   integer

+    */

+    public function getLength()

+    {

+        $boundaryLength     = strlen($this->getBoundary());

+        $headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;

+        $headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;

+        $length             = $boundaryLength + 6;

+        foreach ($this->_params as $p) {

+            $length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;

+        }

+        foreach ($this->_uploads as $u) {

+            $length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +

+                       strlen($u['filename']) + $u['size'] + 2;

+        }

+        return $length;

+    }

+

+   /**

+    * Returns the boundary to use in Content-Type header

+    *

+    * @return   string

+    */

+    public function getBoundary()

+    {

+        if (empty($this->_boundary)) {

+            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());

+        }

+        return $this->_boundary;

+    }

+

+   /**

+    * Returns next chunk of request body

+    *

+    * @param    integer Amount of bytes to read

+    * @return   string  Up to $length bytes of data, empty string if at end

+    */

+    public function read($length)

+    {

+        $ret         = '';

+        $boundary    = $this->getBoundary();

+        $paramCount  = count($this->_params);

+        $uploadCount = count($this->_uploads);

+        while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {

+            $oldLength = $length;

+            if ($this->_pos[0] < $paramCount) {

+                $param = sprintf($this->_headerParam, $boundary, 

+                                 $this->_params[$this->_pos[0]][0]) .

+                         $this->_params[$this->_pos[0]][1] . "\r\n";

+                $ret    .= substr($param, $this->_pos[1], $length);

+                $length -= min(strlen($param) - $this->_pos[1], $length);

+

+            } elseif ($this->_pos[0] < $paramCount + $uploadCount) {

+                $pos    = $this->_pos[0] - $paramCount;

+                $header = sprintf($this->_headerUpload, $boundary,

+                                  $this->_uploads[$pos]['name'],

+                                  $this->_uploads[$pos]['filename'],

+                                  $this->_uploads[$pos]['type']);

+                if ($this->_pos[1] < strlen($header)) {

+                    $ret    .= substr($header, $this->_pos[1], $length);

+                    $length -= min(strlen($header) - $this->_pos[1], $length);

+                }

+                $filePos  = max(0, $this->_pos[1] - strlen($header));

+                if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {

+                    $ret     .= fread($this->_uploads[$pos]['fp'], $length);

+                    $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);

+                }

+                if ($length > 0) {

+                    $start   = $this->_pos[1] + ($oldLength - $length) -

+                               strlen($header) - $this->_uploads[$pos]['size'];

+                    $ret    .= substr("\r\n", $start, $length);

+                    $length -= min(2 - $start, $length);

+                }

+

+            } else {

+                $closing  = '--' . $boundary . "--\r\n";

+                $ret     .= substr($closing, $this->_pos[1], $length);

+                $length  -= min(strlen($closing) - $this->_pos[1], $length);

+            }

+            if ($length > 0) {

+                $this->_pos     = array($this->_pos[0] + 1, 0);

+            } else {

+                $this->_pos[1] += $oldLength;

+            }

+        }

+        return $ret;

+    }

+

+   /**

+    * Sets the current position to the start of the body

+    *

+    * This allows reusing the same body in another request

+    */

+    public function rewind()

+    {

+        $this->_pos = array(0, 0);

+        foreach ($this->_uploads as $u) {

+            rewind($u['fp']);

+        }

+    }

+

+   /**

+    * Returns the body as string

+    *

+    * Note that it reads all file uploads into memory so it is a good idea not

+    * to use this method with large file uploads and rely on read() instead.

+    *

+    * @return   string

+    */

+    public function __toString()

+    {

+        $this->rewind();

+        return $this->read($this->getLength());

+    }

+

+

+   /**

+    * Helper function to change the (probably multidimensional) associative array

+    * into the simple one.

+    *

+    * @param    string  name for item

+    * @param    mixed   item's values

+    * @param    bool    whether to append [] to array variables' names

+    * @return   array   array with the following items: array('item name', 'item value');

+    */

+    private static function _flattenArray($name, $values, $useBrackets)

+    {

+        if (!is_array($values)) {

+            return array(array($name, $values));

+        } else {

+            $ret = array();

+            foreach ($values as $k => $v) {

+                if (empty($name)) {

+                    $newName = $k;

+                } elseif ($useBrackets) {

+                    $newName = $name . '[' . $k . ']';

+                } else {

+                    $newName = $name;

+                }

+                $ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));

+            }

+            return $ret;

+        }

+    }

+}

+?>

diff --git a/extlib/HTTP/Request2/Observer/Log.php b/extlib/HTTP/Request2/Observer/Log.php
new file mode 100644
index 000000000..b1a055278
--- /dev/null
+++ b/extlib/HTTP/Request2/Observer/Log.php
@@ -0,0 +1,215 @@
+<?php

+/**

+ * An observer useful for debugging / testing.

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category HTTP

+ * @package  HTTP_Request2

+ * @author   David Jean Louis <izi@php.net>

+ * @author   Alexey Borzov <avb@php.net>

+ * @license  http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version  CVS: $Id: Log.php 272593 2009-01-02 16:27:14Z avb $

+ * @link     http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Exception class for HTTP_Request2 package

+ */ 

+require_once 'HTTP/Request2/Exception.php';

+

+/**

+ * A debug observer useful for debugging / testing.

+ *

+ * This observer logs to a log target data corresponding to the various request 

+ * and response events, it logs by default to php://output but can be configured

+ * to log to a file or via the PEAR Log package.

+ *

+ * A simple example:

+ * <code>

+ * require_once 'HTTP/Request2.php';

+ * require_once 'HTTP/Request2/Observer/Log.php';

+ *

+ * $request  = new HTTP_Request2('http://www.example.com');

+ * $observer = new HTTP_Request2_Observer_Log();

+ * $request->attach($observer);

+ * $request->send();

+ * </code>

+ *

+ * A more complex example with PEAR Log:

+ * <code>

+ * require_once 'HTTP/Request2.php';

+ * require_once 'HTTP/Request2/Observer/Log.php';

+ * require_once 'Log.php';

+ *

+ * $request  = new HTTP_Request2('http://www.example.com');

+ * // we want to log with PEAR log

+ * $observer = new HTTP_Request2_Observer_Log(Log::factory('console'));

+ *

+ * // we only want to log received headers

+ * $observer->events = array('receivedHeaders');

+ *

+ * $request->attach($observer);

+ * $request->send();

+ * </code>

+ *

+ * @category HTTP

+ * @package  HTTP_Request2

+ * @author   David Jean Louis <izi@php.net>

+ * @author   Alexey Borzov <avb@php.net>

+ * @license  http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version  Release: 0.4.1

+ * @link     http://pear.php.net/package/HTTP_Request2

+ */

+class HTTP_Request2_Observer_Log implements SplObserver

+{

+    // properties {{{

+

+    /**

+     * The log target, it can be a a resource or a PEAR Log instance.

+     *

+     * @var resource|Log $target

+     */

+    protected $target = null;

+

+    /**

+     * The events to log.

+     *

+     * @var array $events

+     */

+    public $events = array(

+        'connect',

+        'sentHeaders',

+        'sentBodyPart',

+        'receivedHeaders',

+        'receivedBody',

+        'disconnect',

+    );

+

+    // }}}

+    // __construct() {{{

+

+    /**

+     * Constructor.

+     *

+     * @param mixed $target Can be a file path (default: php://output), a resource,

+     *                      or an instance of the PEAR Log class.

+     * @param array $events Array of events to listen to (default: all events)

+     *

+     * @return void

+     */

+    public function __construct($target = 'php://output', array $events = array())

+    {

+        if (!empty($events)) {

+            $this->events = $events;

+        }

+        if (is_resource($target) || $target instanceof Log) {

+            $this->target = $target;

+        } elseif (false === ($this->target = @fopen($target, 'w'))) {

+            throw new HTTP_Request2_Exception("Unable to open '{$target}'");

+        }

+    }

+

+    // }}}

+    // update() {{{

+

+    /**

+     * Called when the request notify us of an event.

+     *

+     * @param HTTP_Request2 $subject The HTTP_Request2 instance

+     *

+     * @return void

+     */

+    public function update(SplSubject $subject)

+    {

+        $event = $subject->getLastEvent();

+        if (!in_array($event['name'], $this->events)) {

+            return;

+        }

+

+        switch ($event['name']) {

+        case 'connect':

+            $this->log('* Connected to ' . $event['data']);

+            break;

+        case 'sentHeaders':

+            $headers = explode("\r\n", $event['data']);

+            array_pop($headers);

+            foreach ($headers as $header) {

+                $this->log('> ' . $header);

+            }

+            break;

+        case 'sentBodyPart':

+            $this->log('> ' . $event['data']);

+            break;

+        case 'receivedHeaders':

+            $this->log(sprintf('< HTTP/%s %s %s',

+                $event['data']->getVersion(),

+                $event['data']->getStatus(),

+                $event['data']->getReasonPhrase()));

+            $headers = $event['data']->getHeader();

+            foreach ($headers as $key => $val) {

+                $this->log('< ' . $key . ': ' . $val);

+            }

+            $this->log('< ');

+            break;

+        case 'receivedBody':

+            $this->log($event['data']->getBody());

+            break;

+        case 'disconnect':

+            $this->log('* Disconnected');

+            break;

+        }

+    }

+    

+    // }}}

+    // log() {{{

+

+    /**

+     * Log the given message to the configured target.

+     *

+     * @param string $message Message to display

+     *

+     * @return void

+     */

+    protected function log($message)

+    {

+        if ($this->target instanceof Log) {

+            $this->target->debug($message);

+        } elseif (is_resource($this->target)) {

+            fwrite($this->target, $message . "\r\n");

+        }

+    }

+

+    // }}}

+}

+

+?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/Response.php b/extlib/HTTP/Request2/Response.php
new file mode 100644
index 000000000..c7c1021fb
--- /dev/null
+++ b/extlib/HTTP/Request2/Response.php
@@ -0,0 +1,549 @@
+<?php

+/**

+ * Class representing a HTTP response

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Response.php 287948 2009-09-01 17:12:18Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Exception class for HTTP_Request2 package

+ */ 

+require_once 'HTTP/Request2/Exception.php';

+

+/**

+ * Class representing a HTTP response

+ *

+ * The class is designed to be used in "streaming" scenario, building the

+ * response as it is being received:

+ * <code>

+ * $statusLine = read_status_line();

+ * $response = new HTTP_Request2_Response($statusLine);

+ * do {

+ *     $headerLine = read_header_line();

+ *     $response->parseHeaderLine($headerLine);

+ * } while ($headerLine != '');

+ * 

+ * while ($chunk = read_body()) {

+ *     $response->appendBody($chunk);

+ * }

+ * 

+ * var_dump($response->getHeader(), $response->getCookies(), $response->getBody());

+ * </code>

+ *

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @version    Release: 0.4.1

+ * @link       http://tools.ietf.org/html/rfc2616#section-6

+ */

+class HTTP_Request2_Response

+{

+   /**

+    * HTTP protocol version (e.g. 1.0, 1.1)

+    * @var  string

+    */

+    protected $version;

+

+   /**

+    * Status code

+    * @var  integer

+    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1

+    */

+    protected $code;

+

+   /**

+    * Reason phrase

+    * @var  string

+    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1

+    */

+    protected $reasonPhrase;

+

+   /**

+    * Associative array of response headers

+    * @var  array

+    */

+    protected $headers = array();

+

+   /**

+    * Cookies set in the response

+    * @var  array

+    */

+    protected $cookies = array();

+

+   /**

+    * Name of last header processed by parseHederLine()

+    *

+    * Used to handle the headers that span multiple lines

+    *

+    * @var  string

+    */

+    protected $lastHeader = null;

+

+   /**

+    * Response body

+    * @var  string

+    */

+    protected $body = '';

+

+   /**

+    * Whether the body is still encoded by Content-Encoding

+    *

+    * cURL provides the decoded body to the callback; if we are reading from

+    * socket the body is still gzipped / deflated

+    *

+    * @var  bool

+    */

+    protected $bodyEncoded;

+

+   /**

+    * Associative array of HTTP status code / reason phrase.

+    *

+    * @var  array

+    * @link http://tools.ietf.org/html/rfc2616#section-10

+    */

+    protected static $phrases = array(

+

+        // 1xx: Informational - Request received, continuing process

+        100 => 'Continue',

+        101 => 'Switching Protocols',

+

+        // 2xx: Success - The action was successfully received, understood and

+        // accepted

+        200 => 'OK',

+        201 => 'Created',

+        202 => 'Accepted',

+        203 => 'Non-Authoritative Information',

+        204 => 'No Content',

+        205 => 'Reset Content',

+        206 => 'Partial Content',

+

+        // 3xx: Redirection - Further action must be taken in order to complete

+        // the request

+        300 => 'Multiple Choices',

+        301 => 'Moved Permanently',

+        302 => 'Found',  // 1.1

+        303 => 'See Other',

+        304 => 'Not Modified',

+        305 => 'Use Proxy',

+        307 => 'Temporary Redirect',

+

+        // 4xx: Client Error - The request contains bad syntax or cannot be 

+        // fulfilled

+        400 => 'Bad Request',

+        401 => 'Unauthorized',

+        402 => 'Payment Required',

+        403 => 'Forbidden',

+        404 => 'Not Found',

+        405 => 'Method Not Allowed',

+        406 => 'Not Acceptable',

+        407 => 'Proxy Authentication Required',

+        408 => 'Request Timeout',

+        409 => 'Conflict',

+        410 => 'Gone',

+        411 => 'Length Required',

+        412 => 'Precondition Failed',

+        413 => 'Request Entity Too Large',

+        414 => 'Request-URI Too Long',

+        415 => 'Unsupported Media Type',

+        416 => 'Requested Range Not Satisfiable',

+        417 => 'Expectation Failed',

+

+        // 5xx: Server Error - The server failed to fulfill an apparently

+        // valid request

+        500 => 'Internal Server Error',

+        501 => 'Not Implemented',

+        502 => 'Bad Gateway',

+        503 => 'Service Unavailable',

+        504 => 'Gateway Timeout',

+        505 => 'HTTP Version Not Supported',

+        509 => 'Bandwidth Limit Exceeded',

+

+    );

+

+   /**

+    * Constructor, parses the response status line

+    *

+    * @param    string  Response status line (e.g. "HTTP/1.1 200 OK")

+    * @param    bool    Whether body is still encoded by Content-Encoding

+    * @throws   HTTP_Request2_Exception if status line is invalid according to spec

+    */

+    public function __construct($statusLine, $bodyEncoded = true)

+    {

+        if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {

+            throw new HTTP_Request2_Exception("Malformed response: {$statusLine}");

+        }

+        $this->version = $m[1];

+        $this->code    = intval($m[2]);

+        if (!empty($m[3])) {

+            $this->reasonPhrase = trim($m[3]);

+        } elseif (!empty(self::$phrases[$this->code])) {

+            $this->reasonPhrase = self::$phrases[$this->code];

+        }

+        $this->bodyEncoded = (bool)$bodyEncoded;

+    }

+

+   /**

+    * Parses the line from HTTP response filling $headers array

+    *

+    * The method should be called after reading the line from socket or receiving 

+    * it into cURL callback. Passing an empty string here indicates the end of

+    * response headers and triggers additional processing, so be sure to pass an

+    * empty string in the end.

+    *

+    * @param    string  Line from HTTP response

+    */

+    public function parseHeaderLine($headerLine)

+    {

+        $headerLine = trim($headerLine, "\r\n");

+

+        // empty string signals the end of headers, process the received ones

+        if ('' == $headerLine) {

+            if (!empty($this->headers['set-cookie'])) {

+                $cookies = is_array($this->headers['set-cookie'])?

+                           $this->headers['set-cookie']:

+                           array($this->headers['set-cookie']);

+                foreach ($cookies as $cookieString) {

+                    $this->parseCookie($cookieString);

+                }

+                unset($this->headers['set-cookie']);

+            }

+            foreach (array_keys($this->headers) as $k) {

+                if (is_array($this->headers[$k])) {

+                    $this->headers[$k] = implode(', ', $this->headers[$k]);

+                }

+            }

+

+        // string of the form header-name: header value

+        } elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {

+            $name  = strtolower($m[1]);

+            $value = trim($m[2]);

+            if (empty($this->headers[$name])) {

+                $this->headers[$name] = $value;

+            } else {

+                if (!is_array($this->headers[$name])) {

+                    $this->headers[$name] = array($this->headers[$name]);

+                }

+                $this->headers[$name][] = $value;

+            }

+            $this->lastHeader = $name;

+

+        // string 

+        } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {

+            if (!is_array($this->headers[$this->lastHeader])) {

+                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);

+            } else {

+                $key = count($this->headers[$this->lastHeader]) - 1;

+                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);

+            }

+        }

+    } 

+

+   /**

+    * Parses a Set-Cookie header to fill $cookies array

+    *

+    * @param    string    value of Set-Cookie header

+    * @link     http://cgi.netscape.com/newsref/std/cookie_spec.html

+    */

+    protected function parseCookie($cookieString)

+    {

+        $cookie = array(

+            'expires' => null,

+            'domain'  => null,

+            'path'    => null,

+            'secure'  => false

+        );

+

+        // Only a name=value pair

+        if (!strpos($cookieString, ';')) {

+            $pos = strpos($cookieString, '=');

+            $cookie['name']  = trim(substr($cookieString, 0, $pos));

+            $cookie['value'] = trim(substr($cookieString, $pos + 1));

+

+        // Some optional parameters are supplied

+        } else {

+            $elements = explode(';', $cookieString);

+            $pos = strpos($elements[0], '=');

+            $cookie['name']  = trim(substr($elements[0], 0, $pos));

+            $cookie['value'] = trim(substr($elements[0], $pos + 1));

+

+            for ($i = 1; $i < count($elements); $i++) {

+                if (false === strpos($elements[$i], '=')) {

+                    $elName  = trim($elements[$i]);

+                    $elValue = null;

+                } else {

+                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));

+                }

+                $elName = strtolower($elName);

+                if ('secure' == $elName) {

+                    $cookie['secure'] = true;

+                } elseif ('expires' == $elName) {

+                    $cookie['expires'] = str_replace('"', '', $elValue);

+                } elseif ('path' == $elName || 'domain' == $elName) {

+                    $cookie[$elName] = urldecode($elValue);

+                } else {

+                    $cookie[$elName] = $elValue;

+                }

+            }

+        }

+        $this->cookies[] = $cookie;

+    }

+

+   /**

+    * Appends a string to the response body

+    * @param    string

+    */

+    public function appendBody($bodyChunk)

+    {

+        $this->body .= $bodyChunk;

+    }

+

+   /**

+    * Returns the status code

+    * @return   integer 

+    */

+    public function getStatus()

+    {

+        return $this->code;

+    }

+

+   /**

+    * Returns the reason phrase

+    * @return   string

+    */

+    public function getReasonPhrase()

+    {

+        return $this->reasonPhrase;

+    }

+

+   /**

+    * Returns either the named header or all response headers

+    *

+    * @param    string          Name of header to return

+    * @return   string|array    Value of $headerName header (null if header is

+    *                           not present), array of all response headers if

+    *                           $headerName is null

+    */

+    public function getHeader($headerName = null)

+    {

+        if (null === $headerName) {

+            return $this->headers;

+        } else {

+            $headerName = strtolower($headerName);

+            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;

+        }

+    }

+

+   /**

+    * Returns cookies set in response

+    *

+    * @return   array

+    */

+    public function getCookies()

+    {

+        return $this->cookies;

+    }

+

+   /**

+    * Returns the body of the response

+    *

+    * @return   string

+    * @throws   HTTP_Request2_Exception if body cannot be decoded

+    */

+    public function getBody()

+    {

+        if (!$this->bodyEncoded ||

+            !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))

+        ) {

+            return $this->body;

+

+        } else {

+            if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {

+                $oldEncoding = mb_internal_encoding();

+                mb_internal_encoding('iso-8859-1');

+            }

+

+            try {

+                switch (strtolower($this->getHeader('content-encoding'))) {

+                    case 'gzip':

+                        $decoded = self::decodeGzip($this->body);

+                        break;

+                    case 'deflate':

+                        $decoded = self::decodeDeflate($this->body);

+                }

+            } catch (Exception $e) {

+            }

+

+            if (!empty($oldEncoding)) {

+                mb_internal_encoding($oldEncoding);

+            }

+            if (!empty($e)) {

+                throw $e;

+            }

+            return $decoded;

+        }

+    }

+

+   /**

+    * Get the HTTP version of the response

+    *

+    * @return   string

+    */ 

+    public function getVersion()

+    {

+        return $this->version;

+    }

+

+   /**

+    * Decodes the message-body encoded by gzip

+    *

+    * The real decoding work is done by gzinflate() built-in function, this

+    * method only parses the header and checks data for compliance with

+    * RFC 1952

+    *

+    * @param    string  gzip-encoded data

+    * @return   string  decoded data

+    * @throws   HTTP_Request2_Exception

+    * @link     http://tools.ietf.org/html/rfc1952

+    */

+    public static function decodeGzip($data)

+    {

+        $length = strlen($data);

+        // If it doesn't look like gzip-encoded data, don't bother

+        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {

+            return $data;

+        }

+        if (!function_exists('gzinflate')) {

+            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');

+        }

+        $method = ord(substr($data, 2, 1));

+        if (8 != $method) {

+            throw new HTTP_Request2_Exception('Error parsing gzip header: unknown compression method');

+        }

+        $flags = ord(substr($data, 3, 1));

+        if ($flags & 224) {

+            throw new HTTP_Request2_Exception('Error parsing gzip header: reserved bits are set');

+        }

+

+        // header is 10 bytes minimum. may be longer, though.

+        $headerLength = 10;

+        // extra fields, need to skip 'em

+        if ($flags & 4) {

+            if ($length - $headerLength - 2 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $extraLength = unpack('v', substr($data, 10, 2));

+            if ($length - $headerLength - 2 - $extraLength[1] < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $headerLength += $extraLength[1] + 2;

+        }

+        // file name, need to skip that

+        if ($flags & 8) {

+            if ($length - $headerLength - 1 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $filenameLength = strpos(substr($data, $headerLength), chr(0));

+            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $headerLength += $filenameLength + 1;

+        }

+        // comment, need to skip that also

+        if ($flags & 16) {

+            if ($length - $headerLength - 1 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $commentLength = strpos(substr($data, $headerLength), chr(0));

+            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $headerLength += $commentLength + 1;

+        }

+        // have a CRC for header. let's check

+        if ($flags & 2) {

+            if ($length - $headerLength - 2 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));

+            $crcStored = unpack('v', substr($data, $headerLength, 2));

+            if ($crcReal != $crcStored[1]) {

+                throw new HTTP_Request2_Exception('Header CRC check failed');

+            }

+            $headerLength += 2;

+        }

+        // unpacked data CRC and size at the end of encoded data

+        $tmp = unpack('V2', substr($data, -8));

+        $dataCrc  = $tmp[1];

+        $dataSize = $tmp[2];

+

+        // finally, call the gzinflate() function

+        // don't pass $dataSize to gzinflate, see bugs #13135, #14370

+        $unpacked = gzinflate(substr($data, $headerLength, -8));

+        if (false === $unpacked) {

+            throw new HTTP_Request2_Exception('gzinflate() call failed');

+        } elseif ($dataSize != strlen($unpacked)) {

+            throw new HTTP_Request2_Exception('Data size check failed');

+        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {

+            throw new HTTP_Request2_Exception('Data CRC check failed');

+        }

+        return $unpacked;

+    }

+

+   /**

+    * Decodes the message-body encoded by deflate

+    *

+    * @param    string  deflate-encoded data

+    * @return   string  decoded data

+    * @throws   HTTP_Request2_Exception

+    */

+    public static function decodeDeflate($data)

+    {

+        if (!function_exists('gzuncompress')) {

+            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');

+        }

+        // RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,

+        // while many applications send raw deflate stream from RFC 1951.

+        // We should check for presence of zlib header and use gzuncompress() or

+        // gzinflate() as needed. See bug #15305

+        $header = unpack('n', substr($data, 0, 2));

+        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);

+    }

+}

+?>
\ No newline at end of file
diff --git a/extlib/Net/LDAP2.php b/extlib/Net/LDAP2.php
new file mode 100644
index 000000000..26f5e7560
--- /dev/null
+++ b/extlib/Net/LDAP2.php
@@ -0,0 +1,1791 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2 interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Del <del@babel.com.au>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: LDAP2.php 286788 2009-08-04 06:05:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Package includes.
+*/
+require_once 'PEAR.php';
+require_once 'Net/LDAP2/RootDSE.php';
+require_once 'Net/LDAP2/Schema.php';
+require_once 'Net/LDAP2/Entry.php';
+require_once 'Net/LDAP2/Search.php';
+require_once 'Net/LDAP2/Util.php';
+require_once 'Net/LDAP2/Filter.php';
+require_once 'Net/LDAP2/LDIF.php';
+require_once 'Net/LDAP2/SchemaCache.interface.php';
+require_once 'Net/LDAP2/SimpleFileSchemaCache.php';
+
+/**
+*  Error constants for errors that are not LDAP errors.
+*/
+define('NET_LDAP2_ERROR', 1000);
+
+/**
+* Net_LDAP2 Version
+*/
+define('NET_LDAP2_VERSION', '2.0.7');
+
+/**
+* Net_LDAP2 - manipulate LDAP servers the right way!
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Del <del@babel.com.au>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
+* @license   http://www.gnu.org/copyleft/lesser.html LGPL
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+class Net_LDAP2 extends PEAR
+{
+    /**
+    * Class configuration array
+    *
+    * host     = the ldap host to connect to
+    *            (may be an array of several hosts to try)
+    * port     = the server port
+    * version  = ldap version (defaults to v 3)
+    * starttls = when set, ldap_start_tls() is run after connecting.
+    * bindpw   = no explanation needed
+    * binddn   = the DN to bind as.
+    * basedn   = ldap base
+    * options  = hash of ldap options to set (opt => val)
+    * filter   = default search filter
+    * scope    = default search scope
+    *
+    * Newly added in 2.0.0RC4, for auto-reconnect:
+    * auto_reconnect  = if set to true then the class will automatically
+    *                   attempt to reconnect to the LDAP server in certain
+    *                   failure conditionswhen attempting a search, or other
+    *                   LDAP operation.  Defaults to false.  Note that if you
+    *                   set this to true, calls to search() may block
+    *                   indefinitely if there is a catastrophic server failure.
+    * min_backoff     = minimum reconnection delay period (in seconds).
+    * current_backoff = initial reconnection delay period (in seconds).
+    * max_backoff     = maximum reconnection delay period (in seconds).
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_config = array('host'            => 'localhost',
+                               'port'            => 389,
+                               'version'         => 3,
+                               'starttls'        => false,
+                               'binddn'          => '',
+                               'bindpw'          => '',
+                               'basedn'          => '',
+                               'options'         => array(),
+                               'filter'          => '(objectClass=*)',
+                               'scope'           => 'sub',
+                               'auto_reconnect'  => false,
+                               'min_backoff'     => 1,
+                               'current_backoff' => 1,
+                               'max_backoff'     => 32);
+
+    /**
+    * List of hosts we try to establish a connection to
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_host_list = array();
+
+    /**
+    * List of hosts that are known to be down.
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_down_host_list = array();
+
+    /**
+    * LDAP resource link.
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_link = false;
+
+    /**
+    * Net_LDAP2_Schema object
+    *
+    * This gets set and returned by {@link schema()}
+    *
+    * @access protected
+    * @var object Net_LDAP2_Schema
+    */
+    protected $_schema = null;
+
+    /**
+    * Schema cacher function callback
+    *
+    * @see registerSchemaCache()
+    * @var string
+    */
+    protected $_schema_cache = null;
+
+    /**
+    * Cache for attribute encoding checks
+    *
+    * @access protected
+    * @var array Hash with attribute names as key and boolean value
+    *            to determine whether they should be utf8 encoded or not.
+    */
+    protected $_schemaAttrs = array();
+
+    /**
+    * Cache for rootDSE objects
+    *
+    * Hash with requested rootDSE attr names as key and rootDSE object as value
+    *
+    * Since the RootDSE object itself may request a rootDSE object,
+    * {@link rootDse()} caches successful requests.
+    * Internally, Net_LDAP2 needs several lookups to this object, so
+    * caching increases performance significally.
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_rootDSE_cache = array();
+
+    /**
+    * Returns the Net_LDAP2 Release version, may be called statically
+    *
+    * @static
+    * @return string Net_LDAP2 version
+    */
+    public static function getVersion()
+    {
+        return NET_LDAP2_VERSION;
+    }
+
+    /**
+    * Configure Net_LDAP2, connect and bind
+    *
+    * Use this method as starting point of using Net_LDAP2
+    * to establish a connection to your LDAP server.
+    *
+    * Static function that returns either an error object or the new Net_LDAP2
+    * object. Something like a factory. Takes a config array with the needed
+    * parameters.
+    *
+    * @param array $config Configuration array
+    *
+    * @access public
+    * @return Net_LDAP2_Error|Net_LDAP2   Net_LDAP2_Error or Net_LDAP2 object
+    */
+    public static function &connect($config = array())
+    {
+        $ldap_check = self::checkLDAPExtension();
+        if (self::iserror($ldap_check)) {
+            return $ldap_check;
+        }
+
+        @$obj = new Net_LDAP2($config);
+
+        // todo? better errorhandling for setConfig()?
+
+        // connect and bind with credentials in config
+        $err = $obj->bind();
+        if (self::isError($err)) {
+            return $err;
+        }
+
+        return $obj;
+    }
+
+    /**
+    * Net_LDAP2 constructor
+    *
+    * Sets the config array
+    *
+    * Please note that the usual way of getting Net_LDAP2 to work is
+    * to call something like:
+    * <code>$ldap = Net_LDAP2::connect($ldap_config);</code>
+    *
+    * @param array $config Configuration array
+    *
+    * @access protected
+    * @return void
+    * @see $_config
+    */
+    public function __construct($config = array())
+    {
+        $this->PEAR('Net_LDAP2_Error');
+        $this->setConfig($config);
+    }
+
+    /**
+    * Sets the internal configuration array
+    *
+    * @param array $config Configuration array
+    *
+    * @access protected
+    * @return void
+    */
+    protected function setConfig($config)
+    {
+        //
+        // Parameter check -- probably should raise an error here if config
+        // is not an array.
+        //
+        if (! is_array($config)) {
+            return;
+        }
+
+        foreach ($config as $k => $v) {
+            if (isset($this->_config[$k])) {
+                $this->_config[$k] = $v;
+            } else {
+                // map old (Net_LDAP2) parms to new ones
+                switch($k) {
+                case "dn":
+                    $this->_config["binddn"] = $v;
+                    break;
+                case "password":
+                    $this->_config["bindpw"] = $v;
+                    break;
+                case "tls":
+                    $this->_config["starttls"] = $v;
+                    break;
+                case "base":
+                    $this->_config["basedn"] = $v;
+                    break;
+                }
+            }
+        }
+
+        //
+        // Ensure the host list is an array.
+        //
+        if (is_array($this->_config['host'])) {
+            $this->_host_list = $this->_config['host'];
+        } else {
+            if (strlen($this->_config['host']) > 0) {
+                $this->_host_list = array($this->_config['host']);
+            } else {
+                $this->_host_list = array();
+                // ^ this will cause an error in performConnect(),
+                // so the user is notified about the failure
+            }
+        }
+
+        //
+        // Reset the down host list, which seems like a sensible thing to do
+        // if the config is being reset for some reason.
+        //
+        $this->_down_host_list = array();
+    }
+
+    /**
+    * Bind or rebind to the ldap-server
+    *
+    * This function binds with the given dn and password to the server. In case
+    * no connection has been made yet, it will be started and startTLS issued
+    * if appropiate.
+    *
+    * The internal bind configuration is not being updated, so if you call
+    * bind() without parameters, you can rebind with the credentials
+    * provided at first connecting to the server.
+    *
+    * @param string $dn       Distinguished name for binding
+    * @param string $password Password for binding
+    *
+    * @access public
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    public function bind($dn = null, $password = null)
+    {
+        // fetch current bind credentials
+        if (is_null($dn)) {
+            $dn = $this->_config["binddn"];
+        }
+        if (is_null($password)) {
+            $password = $this->_config["bindpw"];
+        }
+
+        // Connect first, if we haven't so far.
+        // This will also bind us to the server.
+        if ($this->_link === false) {
+            // store old credentials so we can revert them later
+            // then overwrite config with new bind credentials
+            $olddn = $this->_config["binddn"];
+            $oldpw = $this->_config["bindpw"];
+
+            // overwrite bind credentials in config
+            // so performConnect() knows about them
+            $this->_config["binddn"] = $dn;
+            $this->_config["bindpw"] = $password;
+
+            // try to connect with provided credentials
+            $msg = $this->performConnect();
+
+            // reset to previous config
+            $this->_config["binddn"] = $olddn;
+            $this->_config["bindpw"] = $oldpw;
+
+            // see if bind worked
+            if (self::isError($msg)) {
+                return $msg;
+            }
+        } else {
+            // do the requested bind as we are
+            // asked to bind manually
+            if (is_null($dn)) {
+                // anonymous bind
+                $msg = @ldap_bind($this->_link);
+            } else {
+                // privileged bind
+                $msg = @ldap_bind($this->_link, $dn, $password);
+            }
+            if (false === $msg) {
+                return PEAR::raiseError("Bind failed: " .
+                                        @ldap_error($this->_link),
+                                        @ldap_errno($this->_link));
+            }
+        }
+        return true;
+    }
+
+    /**
+    * Connect to the ldap-server
+    *
+    * This function connects to the LDAP server specified in
+    * the configuration, binds and set up the LDAP protocol as needed.
+    *
+    * @access protected
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    protected function performConnect()
+    {
+        // Note: Connecting is briefly described in RFC1777.
+        // Basicly it works like this:
+        //  1. set up TCP connection
+        //  2. secure that connection if neccessary
+        //  3a. setLDAPVersion to tell server which version we want to speak
+        //  3b. perform bind
+        //  3c. setLDAPVersion to tell server which version we want to speak
+        //      together with a test for supported versions
+        //  4. set additional protocol options
+
+        // Return true if we are already connected.
+        if ($this->_link !== false) {
+            return true;
+        }
+
+        // Connnect to the LDAP server if we are not connected.  Note that
+        // with some LDAP clients, ldapperformConnect returns a link value even
+        // if no connection is made.  We need to do at least one anonymous
+        // bind to ensure that a connection is actually valid.
+        //
+        // Ref: http://www.php.net/manual/en/function.ldap-connect.php
+
+        // Default error message in case all connection attempts
+        // fail but no message is set
+        $current_error = new PEAR_Error('Unknown connection error');
+
+        // Catch empty $_host_list arrays.
+        if (!is_array($this->_host_list) || count($this->_host_list) == 0) {
+            $current_error = PEAR::raiseError('No Servers configured! Please '.
+               'pass in an array of servers to Net_LDAP2');
+            return $current_error;
+        }
+
+        // Cycle through the host list.
+        foreach ($this->_host_list as $host) {
+
+            // Ensure we have a valid string for host name
+            if (is_array($host)) {
+                $current_error = PEAR::raiseError('No Servers configured! '.
+                   'Please pass in an one dimensional array of servers to '.
+                   'Net_LDAP2! (multidimensional array detected!)');
+                continue;
+            }
+
+            // Skip this host if it is known to be down.
+            if (in_array($host, $this->_down_host_list)) {
+                continue;
+            }
+
+            // Record the host that we are actually connecting to in case
+            // we need it later.
+            $this->_config['host'] = $host;
+
+            // Attempt a connection.
+            $this->_link = @ldap_connect($host, $this->_config['port']);
+            if (false === $this->_link) {
+                $current_error = PEAR::raiseError('Could not connect to ' .
+                    $host . ':' . $this->_config['port']);
+                $this->_down_host_list[] = $host;
+                continue;
+            }
+
+            // If we're supposed to use TLS, do so before we try to bind,
+            // as some strict servers only allow binding via secure connections
+            if ($this->_config["starttls"] === true) {
+                if (self::isError($msg = $this->startTLS())) {
+                    $current_error           = $msg;
+                    $this->_link             = false;
+                    $this->_down_host_list[] = $host;
+                    continue;
+                }
+            }
+
+            // Try to set the configured LDAP version on the connection if LDAP
+            // server needs that before binding (eg OpenLDAP).
+            // This could be necessary since rfc-1777 states that the protocol version
+            // has to be set at the bind request.
+            // We use force here which means that the test in the rootDSE is skipped;
+            // this is neccessary, because some strict LDAP servers only allow to
+            // read the LDAP rootDSE (which tells us the supported protocol versions)
+            // with authenticated clients.
+            // This may fail in which case we try again after binding.
+            // In this case, most probably the bind() or setLDAPVersion()-call
+            // below will also fail, providing error messages.
+            $version_set = false;
+            $ignored_err = $this->setLDAPVersion(0, true);
+            if (!self::isError($ignored_err)) {
+                $version_set = true;
+            }
+
+            // Attempt to bind to the server. If we have credentials configured,
+            // we try to use them, otherwise its an anonymous bind.
+            // As stated by RFC-1777, the bind request should be the first
+            // operation to be performed after the connection is established.
+            // This may give an protocol error if the server does not support
+            // V2 binds and the above call to setLDAPVersion() failed.
+            // In case the above call failed, we try an V2 bind here and set the
+            // version afterwards (with checking to the rootDSE).
+            $msg = $this->bind();
+            if (self::isError($msg)) {
+                // The bind failed, discard link and save error msg.
+                // Then record the host as down and try next one
+                if ($msg->getCode() == 0x02 && !$version_set) {
+                    // provide a finer grained error message
+                    // if protocol error arieses because of invalid version
+                    $msg = new Net_LDAP2_Error($msg->getMessage().
+                        " (could not set LDAP protocol version to ".
+                        $this->_config['version'].")",
+                        $msg->getCode());
+                }
+                $this->_link             = false;
+                $current_error           = $msg;
+                $this->_down_host_list[] = $host;
+                continue;
+            }
+
+            // Set desired LDAP version if not successfully set before.
+            // Here, a check against the rootDSE is performed, so we get a
+            // error message if the server does not support the version.
+            // The rootDSE entry should tell us which LDAP versions are
+            // supported. However, some strict LDAP servers only allow
+            // bound suers to read the rootDSE.
+            if (!$version_set) {
+                if (self::isError($msg = $this->setLDAPVersion())) {
+                    $current_error           = $msg;
+                    $this->_link             = false;
+                    $this->_down_host_list[] = $host;
+                    continue;
+                }
+            }
+
+            // Set LDAP parameters, now we know we have a valid connection.
+            if (isset($this->_config['options']) &&
+                is_array($this->_config['options']) &&
+                count($this->_config['options'])) {
+                foreach ($this->_config['options'] as $opt => $val) {
+                    $err = $this->setOption($opt, $val);
+                    if (self::isError($err)) {
+                        $current_error           = $err;
+                        $this->_link             = false;
+                        $this->_down_host_list[] = $host;
+                        continue 2;
+                    }
+                }
+            }
+
+            // At this stage we have connected, bound, and set up options,
+            // so we have a known good LDAP server.  Time to go home.
+            return true;
+        }
+
+
+        // All connection attempts have failed, return the last error.
+        return $current_error;
+    }
+
+    /**
+    * Reconnect to the ldap-server.
+    *
+    * In case the connection to the LDAP
+    * service has dropped out for some reason, this function will reconnect,
+    * and re-bind if a bind has been attempted in the past.  It is probably
+    * most useful when the server list provided to the new() or connect()
+    * function is an array rather than a single host name, because in that
+    * case it will be able to connect to a failover or secondary server in
+    * case the primary server goes down.
+    *
+    * This doesn't return anything, it just tries to re-establish
+    * the current connection.  It will sleep for the current backoff
+    * period (seconds) before attempting the connect, and if the
+    * connection fails it will double the backoff period, but not
+    * try again.  If you want to ensure a reconnection during a
+    * transient period of server downtime then you need to call this
+    * function in a loop.
+    *
+    * @access protected
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    protected function performReconnect()
+    {
+
+        // Return true if we are already connected.
+        if ($this->_link !== false) {
+            return true;
+        }
+
+        // Default error message in case all connection attempts
+        // fail but no message is set
+        $current_error = new PEAR_Error('Unknown connection error');
+
+        // Sleep for a backoff period in seconds.
+        sleep($this->_config['current_backoff']);
+
+        // Retry all available connections.
+        $this->_down_host_list = array();
+        $msg = $this->performConnect();
+
+        // Bail out if that fails.
+        if (self::isError($msg)) {
+            $this->_config['current_backoff'] =
+               $this->_config['current_backoff'] * 2;
+            if ($this->_config['current_backoff'] > $this->_config['max_backoff']) {
+                $this->_config['current_backoff'] = $this->_config['max_backoff'];
+            }
+            return $msg;
+        }
+
+        // Now we should be able to safely (re-)bind.
+        $msg = $this->bind();
+        if (self::isError($msg)) {
+            $this->_config['current_backoff'] = $this->_config['current_backoff'] * 2;
+            if ($this->_config['current_backoff'] > $this->_config['max_backoff']) {
+                $this->_config['current_backoff'] = $this->_config['max_backoff'];
+            }
+
+            // _config['host'] should have had the last connected host stored in it
+            // by performConnect().  Since we are unable to bind to that host we can safely
+            // assume that it is down or has some other problem.
+            $this->_down_host_list[] = $this->_config['host'];
+            return $msg;
+        }
+
+        // At this stage we have connected, bound, and set up options,
+        // so we have a known good LDAP server. Time to go home.
+        $this->_config['current_backoff'] = $this->_config['min_backoff'];
+        return true;
+    }
+
+    /**
+    * Starts an encrypted session
+    *
+    * @access public
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    public function startTLS()
+    {
+        // Test to see if the server supports TLS first.
+        // This is done via testing the extensions offered by the server.
+        // The OID 1.3.6.1.4.1.1466.20037 tells us, if TLS is supported.
+        $rootDSE = $this->rootDse();
+        if (self::isError($rootDSE)) {
+            return $this->raiseError("Unable to fetch rootDSE entry ".
+            "to see if TLS is supoported: ".$rootDSE->getMessage(), $rootDSE->getCode());
+        }
+
+        $supported_extensions = $rootDSE->getValue('supportedExtension');
+        if (self::isError($supported_extensions)) {
+            return $this->raiseError("Unable to fetch rootDSE attribute 'supportedExtension' ".
+            "to see if TLS is supoported: ".$supported_extensions->getMessage(), $supported_extensions->getCode());
+        }
+
+        if (in_array('1.3.6.1.4.1.1466.20037', $supported_extensions)) {
+            if (false === @ldap_start_tls($this->_link)) {
+                return $this->raiseError("TLS not started: " .
+                                        @ldap_error($this->_link),
+                                        @ldap_errno($this->_link));
+            }
+            return true;
+        } else {
+            return $this->raiseError("Server reports that it does not support TLS");
+        }
+    }
+
+    /**
+    * alias function of startTLS() for perl-ldap interface
+    *
+    * @return void
+    * @see startTLS()
+    */
+    public function start_tls()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'startTLS' ), $args);
+    }
+
+    /**
+    * Close LDAP connection.
+    *
+    * Closes the connection. Use this when the session is over.
+    *
+    * @return void
+    */
+    public function done()
+    {
+        $this->_Net_LDAP2();
+    }
+
+    /**
+    * Alias for {@link done()}
+    *
+    * @return void
+    * @see done()
+    */
+    public function disconnect()
+    {
+        $this->done();
+    }
+
+    /**
+    * Destructor
+    *
+    * @access protected
+    */
+    public function _Net_LDAP2()
+    {
+        @ldap_close($this->_link);
+    }
+
+    /**
+    * Add a new entryobject to a directory.
+    *
+    * Use add to add a new Net_LDAP2_Entry object to the directory.
+    * This also links the entry to the connection used for the add,
+    * if it was a fresh entry ({@link Net_LDAP2_Entry::createFresh()})
+    *
+    * @param Net_LDAP2_Entry &$entry Net_LDAP2_Entry
+    *
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    public function add(&$entry)
+    {
+        if (!$entry instanceof Net_LDAP2_Entry) {
+            return PEAR::raiseError('Parameter to Net_LDAP2::add() must be a Net_LDAP2_Entry object.');
+        }
+
+        // Continue attempting the add operation in a loop until we
+        // get a success, a definitive failure, or the world ends.
+        $foo = 0;
+        while (true) {
+            $link = $this->getLink();
+
+            if ($link === false) {
+                // We do not have a successful connection yet.  The call to
+                // getLink() would have kept trying if we wanted one.  Go
+                // home now.
+                return PEAR::raiseError("Could not add entry " . $entry->dn() .
+                       " no valid LDAP connection could be found.");
+            }
+
+            if (@ldap_add($link, $entry->dn(), $entry->getValues())) {
+                // entry successfully added, we should update its $ldap reference
+                // in case it is not set so far (fresh entry)
+                if (!$entry->getLDAP() instanceof Net_LDAP2) {
+                    $entry->setLDAP($this);
+                }
+                // store, that the entry is present inside the directory
+                $entry->markAsNew(false);
+                return true;
+            } else {
+                // We have a failure.  What type?  We may be able to reconnect
+                // and try again.
+                $error_code = @ldap_errno($link);
+                $error_name = $this->errorMessage($error_code);
+
+                if (($error_name === 'LDAP_OPERATIONS_ERROR') &&
+                    ($this->_config['auto_reconnect'])) {
+
+                    // The server has become disconnected before trying the
+                    // operation.  We should try again, possibly with a different
+                    // server.
+                    $this->_link = false;
+                    $this->performReconnect();
+                } else {
+                    // Errors other than the above catched are just passed
+                    // back to the user so he may react upon them.
+                    return PEAR::raiseError("Could not add entry " . $entry->dn() . " " .
+                                            $error_name,
+                                            $error_code);
+                }
+            }
+        }
+    }
+
+    /**
+    * Delete an entry from the directory
+    *
+    * The object may either be a string representing the dn or a Net_LDAP2_Entry
+    * object. When the boolean paramter recursive is set, all subentries of the
+    * entry will be deleted as well.
+    *
+    * @param string|Net_LDAP2_Entry $dn        DN-string or Net_LDAP2_Entry
+    * @param boolean                $recursive Should we delete all children recursive as well?
+    *
+    * @access public
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    public function delete($dn, $recursive = false)
+    {
+        if ($dn instanceof Net_LDAP2_Entry) {
+             $dn = $dn->dn();
+        }
+        if (false === is_string($dn)) {
+            return PEAR::raiseError("Parameter is not a string nor an entry object!");
+        }
+        // Recursive delete searches for children and calls delete for them
+        if ($recursive) {
+            $result = @ldap_list($this->_link, $dn, '(objectClass=*)', array(null), 0, 0);
+            if (@ldap_count_entries($this->_link, $result)) {
+                $subentry = @ldap_first_entry($this->_link, $result);
+                $this->delete(@ldap_get_dn($this->_link, $subentry), true);
+                while ($subentry = @ldap_next_entry($this->_link, $subentry)) {
+                    $this->delete(@ldap_get_dn($this->_link, $subentry), true);
+                }
+            }
+        }
+
+        // Continue attempting the delete operation in a loop until we
+        // get a success, a definitive failure, or the world ends.
+        while (true) {
+            $link = $this->getLink();
+
+            if ($link === false) {
+                // We do not have a successful connection yet.  The call to
+                // getLink() would have kept trying if we wanted one.  Go
+                // home now.
+                return PEAR::raiseError("Could not add entry " . $dn .
+                       " no valid LDAP connection could be found.");
+            }
+
+            if (@ldap_delete($link, $dn)) {
+                // entry successfully deleted.
+                return true;
+            } else {
+                // We have a failure.  What type?
+                // We may be able to reconnect and try again.
+                $error_code = @ldap_errno($link);
+                $error_name = $this->errorMessage($error_code);
+
+                if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') &&
+                    ($this->_config['auto_reconnect'])) {
+                    // The server has become disconnected before trying the
+                    // operation.  We should try again, possibly with a 
+                    // different server.
+                    $this->_link = false;
+                    $this->performReconnect();
+
+                } elseif ($error_code == 66) {
+                    // Subentries present, server refused to delete.
+                    // Deleting subentries is the clients responsibility, but
+                    // since the user may not know of the subentries, we do not
+                    // force that here but instead notify the developer so he
+                    // may take actions himself.
+                    return PEAR::raiseError("Could not delete entry $dn because of subentries. Use the recursive parameter to delete them.");
+
+                } else {
+                    // Errors other than the above catched are just passed
+                    // back to the user so he may react upon them.
+                    return PEAR::raiseError("Could not delete entry " . $dn . " " .
+                                            $error_name,
+                                            $error_code);
+                }
+            }
+        }
+    }
+
+    /**
+    * Modify an ldapentry directly on the server
+    *
+    * This one takes the DN or a Net_LDAP2_Entry object and an array of actions.
+    * This array should be something like this:
+    *
+    * array('add' => array('attribute1' => array('val1', 'val2'),
+    *                      'attribute2' => array('val1')),
+    *       'delete' => array('attribute1'),
+    *       'replace' => array('attribute1' => array('val1')),
+    *       'changes' => array('add' => ...,
+    *                          'replace' => ...,
+    *                          'delete' => array('attribute1', 'attribute2' => array('val1')))
+    *
+    * The changes array is there so the order of operations can be influenced
+    * (the operations are done in order of appearance).
+    * The order of execution is as following:
+    *   1. adds from 'add' array
+    *   2. deletes from 'delete' array
+    *   3. replaces from 'replace' array
+    *   4. changes (add, replace, delete) in order of appearance
+    * All subarrays (add, replace, delete, changes) may be given at the same time.
+    *
+    * The function calls the corresponding functions of an Net_LDAP2_Entry
+    * object. A detailed description of array structures can be found there.
+    *
+    * Unlike the modification methods provided by the Net_LDAP2_Entry object,
+    * this method will instantly carry out an update() after each operation,
+    * thus modifying "directly" on the server.
+    *
+    * @param string|Net_LDAP2_Entry $entry DN-string or Net_LDAP2_Entry
+    * @param array                  $parms Array of changes
+    *
+    * @access public
+    * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true
+    */
+    public function modify($entry, $parms = array())
+    {
+        if (is_string($entry)) {
+            $entry = $this->getEntry($entry);
+            if (self::isError($entry)) {
+                return $entry;
+            }
+        }
+        if (!$entry instanceof Net_LDAP2_Entry) {
+            return PEAR::raiseError("Parameter is not a string nor an entry object!");
+        }
+
+        // Perform changes mentioned separately
+        foreach (array('add', 'delete', 'replace') as $action) {
+            if (isset($parms[$action])) {
+                $msg = $entry->$action($parms[$action]);
+                if (self::isError($msg)) {
+                    return $msg;
+                }
+                $entry->setLDAP($this);
+
+                // Because the @ldap functions are called inside Net_LDAP2_Entry::update(),
+                // we have to trap the error codes issued from that if we want to support
+                // reconnection.
+                while (true) {
+                    $msg = $entry->update();
+
+                    if (self::isError($msg)) {
+                        // We have a failure.  What type?  We may be able to reconnect
+                        // and try again.
+                        $error_code = $msg->getCode();
+                        $error_name = $this->errorMessage($error_code);
+
+                        if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') &&
+                            ($this->_config['auto_reconnect'])) {
+
+                            // The server has become disconnected before trying the
+                            // operation.  We should try again, possibly with a different
+                            // server.
+                            $this->_link = false;
+                            $this->performReconnect();
+
+                        } else {
+
+                            // Errors other than the above catched are just passed
+                            // back to the user so he may react upon them.
+                            return PEAR::raiseError("Could not modify entry: ".$msg->getMessage());
+                        }
+                    } else {
+                        // modification succeedet, evaluate next change
+                        break;
+                    }
+                }
+            }
+        }
+
+        // perform combined changes in 'changes' array
+        if (isset($parms['changes']) && is_array($parms['changes'])) {
+            foreach ($parms['changes'] as $action => $value) {
+
+                // Because the @ldap functions are called inside Net_LDAP2_Entry::update,
+                // we have to trap the error codes issued from that if we want to support
+                // reconnection.
+                while (true) {
+                    $msg = $this->modify($entry, array($action => $value));
+
+                    if (self::isError($msg)) {
+                        // We have a failure.  What type?  We may be able to reconnect
+                        // and try again.
+                        $error_code = $msg->getCode();
+                        $error_name = $this->errorMessage($error_code);
+
+                        if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') &&
+                            ($this->_config['auto_reconnect'])) {
+
+                            // The server has become disconnected before trying the
+                            // operation.  We should try again, possibly with a different
+                            // server.
+                            $this->_link = false;
+                            $this->performReconnect();
+
+                        } else {
+                            // Errors other than the above catched are just passed
+                            // back to the user so he may react upon them.
+                            return $msg;
+                        }
+                    } else {
+                        // modification succeedet, evaluate next change
+                        break;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+    * Run a ldap search query
+    *
+    * Search is used to query the ldap-database.
+    * $base and $filter may be ommitted. The one from config will
+    * then be used. $base is either a DN-string or an Net_LDAP2_Entry
+    * object in which case its DN willb e used.
+    *
+    * Params may contain:
+    *
+    * scope: The scope which will be used for searching
+    *        base - Just one entry
+    *        sub  - The whole tree
+    *        one  - Immediately below $base
+    * sizelimit: Limit the number of entries returned (default: 0 = unlimited),
+    * timelimit: Limit the time spent for searching (default: 0 = unlimited),
+    * attrsonly: If true, the search will only return the attribute names,
+    * attributes: Array of attribute names, which the entry should contain.
+    *             It is good practice to limit this to just the ones you need.
+    * [NOT IMPLEMENTED]
+    * deref: By default aliases are dereferenced to locate the base object for the search, but not when
+    *        searching subordinates of the base object. This may be changed by specifying one of the
+    *        following values:
+    *
+    *        never  - Do not dereference aliases in searching or in locating the base object of the search.
+    *        search - Dereference aliases in subordinates of the base object in searching, but not in
+    *                locating the base object of the search.
+    *        find
+    *        always
+    *
+    * Please note, that you cannot override server side limitations to sizelimit
+    * and timelimit: You can always only lower a given limit.
+    *
+    * @param string|Net_LDAP2_Entry  $base   LDAP searchbase
+    * @param string|Net_LDAP2_Filter $filter LDAP search filter or a Net_LDAP2_Filter object
+    * @param array                   $params Array of options
+    *
+    * @access public
+    * @return Net_LDAP2_Search|Net_LDAP2_Error Net_LDAP2_Search object or Net_LDAP2_Error object
+    * @todo implement search controls (sorting etc)
+    */
+    public function search($base = null, $filter = null, $params = array())
+    {
+        if (is_null($base)) {
+            $base = $this->_config['basedn'];
+        }
+        if ($base instanceof Net_LDAP2_Entry) {
+            $base = $base->dn(); // fetch DN of entry, making searchbase relative to the entry
+        }
+        if (is_null($filter)) {
+            $filter = $this->_config['filter'];
+        }
+        if ($filter instanceof Net_LDAP2_Filter) {
+            $filter = $filter->asString(); // convert Net_LDAP2_Filter to string representation
+        }
+        if (PEAR::isError($filter)) {
+            return $filter;
+        }
+        if (PEAR::isError($base)) {
+            return $base;
+        }
+
+        /* setting searchparameters  */
+        (isset($params['sizelimit']))  ? $sizelimit  = $params['sizelimit']  : $sizelimit = 0;
+        (isset($params['timelimit']))  ? $timelimit  = $params['timelimit']  : $timelimit = 0;
+        (isset($params['attrsonly']))  ? $attrsonly  = $params['attrsonly']  : $attrsonly = 0;
+        (isset($params['attributes'])) ? $attributes = $params['attributes'] : $attributes = array();
+
+        // Ensure $attributes to be an array in case only one
+        // attribute name was given as string
+        if (!is_array($attributes)) {
+            $attributes = array($attributes);
+        }
+
+        // reorganize the $attributes array index keys
+        // sometimes there are problems with not consecutive indexes
+        $attributes = array_values($attributes);
+
+        // scoping makes searches faster!
+        $scope = (isset($params['scope']) ? $params['scope'] : $this->_config['scope']);
+
+        switch ($scope) {
+        case 'one':
+            $search_function = 'ldap_list';
+            break;
+        case 'base':
+            $search_function = 'ldap_read';
+            break;
+        default:
+            $search_function = 'ldap_search';
+        }
+
+        // Continue attempting the search operation until we get a success
+        // or a definitive failure.
+        while (true) {
+            $link = $this->getLink();
+            $search = @call_user_func($search_function,
+                                      $link,
+                                      $base,
+                                      $filter,
+                                      $attributes,
+                                      $attrsonly,
+                                      $sizelimit,
+                                      $timelimit);
+
+            if ($err = @ldap_errno($link)) {
+                if ($err == 32) {
+                    // Errorcode 32 = no such object, i.e. a nullresult.
+                    return $obj = new Net_LDAP2_Search ($search, $this, $attributes);
+                } elseif ($err == 4) {
+                    // Errorcode 4 = sizelimit exeeded.
+                    return $obj = new Net_LDAP2_Search ($search, $this, $attributes);
+                } elseif ($err == 87) {
+                    // bad search filter
+                    return $this->raiseError($this->errorMessage($err) . "($filter)", $err);
+                } elseif (($err == 1) && ($this->_config['auto_reconnect'])) {
+                    // Errorcode 1 = LDAP_OPERATIONS_ERROR but we can try a reconnect.
+                    $this->_link = false;
+                    $this->performReconnect();
+                } else {
+                    $msg = "\nParameters:\nBase: $base\nFilter: $filter\nScope: $scope";
+                    return $this->raiseError($this->errorMessage($err) . $msg, $err);
+                }
+            } else {
+                return $obj = new Net_LDAP2_Search($search, $this, $attributes);
+            }
+        }
+    }
+
+    /**
+    * Set an LDAP option
+    *
+    * @param string $option Option to set
+    * @param mixed  $value  Value to set Option to
+    *
+    * @access public
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    public function setOption($option, $value)
+    {
+        if ($this->_link) {
+            if (defined($option)) {
+                if (@ldap_set_option($this->_link, constant($option), $value)) {
+                    return true;
+                } else {
+                    $err = @ldap_errno($this->_link);
+                    if ($err) {
+                        $msg = @ldap_err2str($err);
+                    } else {
+                        $err = NET_LDAP2_ERROR;
+                        $msg = $this->errorMessage($err);
+                    }
+                    return $this->raiseError($msg, $err);
+                }
+            } else {
+                return $this->raiseError("Unkown Option requested");
+            }
+        } else {
+            return $this->raiseError("Could not set LDAP option: No LDAP connection");
+        }
+    }
+
+    /**
+    * Get an LDAP option value
+    *
+    * @param string $option Option to get
+    *
+    * @access public
+    * @return Net_LDAP2_Error|string Net_LDAP2_Error or option value
+    */
+    public function getOption($option)
+    {
+        if ($this->_link) {
+            if (defined($option)) {
+                if (@ldap_get_option($this->_link, constant($option), $value)) {
+                    return $value;
+                } else {
+                    $err = @ldap_errno($this->_link);
+                    if ($err) {
+                        $msg = @ldap_err2str($err);
+                    } else {
+                        $err = NET_LDAP2_ERROR;
+                        $msg = $this->errorMessage($err);
+                    }
+                    return $this->raiseError($msg, $err);
+                }
+            } else {
+                $this->raiseError("Unkown Option requested");
+            }
+        } else {
+            $this->raiseError("No LDAP connection");
+        }
+    }
+
+    /**
+    * Get the LDAP_PROTOCOL_VERSION that is used on the connection.
+    *
+    * A lot of ldap functionality is defined by what protocol version the ldap server speaks.
+    * This might be 2 or 3.
+    *
+    * @return int
+    */
+    public function getLDAPVersion()
+    {
+        if ($this->_link) {
+            $version = $this->getOption("LDAP_OPT_PROTOCOL_VERSION");
+        } else {
+            $version = $this->_config['version'];
+        }
+        return $version;
+    }
+
+    /**
+    * Set the LDAP_PROTOCOL_VERSION that is used on the connection.
+    *
+    * @param int     $version LDAP-version that should be used
+    * @param boolean $force   If set to true, the check against the rootDSE will be skipped
+    *
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    * @todo Checking via the rootDSE takes much time - why? fetching and instanciation is quick!
+    */
+    public function setLDAPVersion($version = 0, $force = false)
+    {
+        if (!$version) {
+            $version = $this->_config['version'];
+        }
+
+        //
+        // Check to see if the server supports this version first.
+        //
+        // Todo: Why is this so horribly slow?
+        // $this->rootDse() is very fast, as well as Net_LDAP2_RootDSE::fetch()
+        // seems like a problem at copiyng the object inside PHP??
+        // Additionally, this is not always reproducable...
+        //
+        if (!$force) {
+            $rootDSE = $this->rootDse();
+            if ($rootDSE instanceof Net_LDAP2_Error) {
+                return $rootDSE;
+            } else {
+                $supported_versions = $rootDSE->getValue('supportedLDAPVersion');
+                if (is_string($supported_versions)) {
+                    $supported_versions = array($supported_versions);
+                }
+                $check_ok = in_array($version, $supported_versions);
+            }
+        }
+
+        if ($force || $check_ok) {
+            return $this->setOption("LDAP_OPT_PROTOCOL_VERSION", $version);
+        } else {
+            return $this->raiseError("LDAP Server does not support protocol version " . $version);
+        }
+    }
+
+
+    /**
+    * Tells if a DN does exist in the directory
+    *
+    * @param string|Net_LDAP2_Entry $dn The DN of the object to test
+    *
+    * @return boolean|Net_LDAP2_Error
+    */
+    public function dnExists($dn)
+    {
+        if (PEAR::isError($dn)) {
+            return $dn;
+        }
+        if ($dn instanceof Net_LDAP2_Entry) {
+             $dn = $dn->dn();
+        }
+        if (false === is_string($dn)) {
+            return PEAR::raiseError('Parameter $dn is not a string nor an entry object!');
+        }
+
+        // make dn relative to parent
+        $base = Net_LDAP2_Util::ldap_explode_dn($dn, array('casefold' => 'none', 'reverse' => false, 'onlyvalues' => false));
+        if (self::isError($base)) {
+            return $base;
+        }
+        $entry_rdn = array_shift($base);
+        if (is_array($entry_rdn)) {
+            // maybe the dn consist of a multivalued RDN, we must build the dn in this case
+            // because the $entry_rdn is an array!
+            $filter_dn = Net_LDAP2_Util::canonical_dn($entry_rdn);
+        }
+        $base = Net_LDAP2_Util::canonical_dn($base);
+
+        $result = @ldap_list($this->_link, $base, $entry_rdn, array(), 1, 1);
+        if (@ldap_count_entries($this->_link, $result)) {
+            return true;
+        }
+        if (ldap_errno($this->_link) == 32) {
+            return false;
+        }
+        if (ldap_errno($this->_link) != 0) {
+            return PEAR::raiseError(ldap_error($this->_link), ldap_errno($this->_link));
+        }
+        return false;
+    }
+
+
+    /**
+    * Get a specific entry based on the DN
+    *
+    * @param string $dn   DN of the entry that should be fetched
+    * @param array  $attr Array of Attributes to select. If ommitted, all attributes are fetched.
+    *
+    * @return Net_LDAP2_Entry|Net_LDAP2_Error    Reference to a Net_LDAP2_Entry object or Net_LDAP2_Error object
+    * @todo Maybe check against the shema should be done to be sure the attribute type exists
+    */
+    public function &getEntry($dn, $attr = array())
+    {
+        if (!is_array($attr)) {
+            $attr = array($attr);
+        }
+        $result = $this->search($dn, '(objectClass=*)',
+                                array('scope' => 'base', 'attributes' => $attr));
+        if (self::isError($result)) {
+            return $result;
+        } elseif ($result->count() == 0) {
+            return PEAR::raiseError('Could not fetch entry '.$dn.': no entry found');
+        }
+        $entry = $result->shiftEntry();
+        if (false == $entry) {
+            return PEAR::raiseError('Could not fetch entry (error retrieving entry from search result)');
+        }
+        return $entry;
+    }
+
+    /**
+    * Rename or move an entry
+    *
+    * This method will instantly carry out an update() after the move,
+    * so the entry is moved instantly.
+    * You can pass an optional Net_LDAP2 object. In this case, a cross directory
+    * move will be performed which deletes the entry in the source (THIS) directory
+    * and adds it in the directory $target_ldap.
+    * A cross directory move will switch the Entrys internal LDAP reference so
+    * updates to the entry will go to the new directory.
+    *
+    * Note that if you want to do a cross directory move, you need to
+    * pass an Net_LDAP2_Entry object, otherwise the attributes will be empty.
+    *
+    * @param string|Net_LDAP2_Entry $entry       Entry DN or Entry object
+    * @param string                 $newdn       New location
+    * @param Net_LDAP2              $target_ldap (optional) Target directory for cross server move; should be passed via reference
+    *
+    * @return Net_LDAP2_Error|true
+    */
+    public function move($entry, $newdn, $target_ldap = null)
+    {
+        if (is_string($entry)) {
+            $entry_o = $this->getEntry($entry);
+        } else {
+            $entry_o =& $entry;
+        }
+        if (!$entry_o instanceof Net_LDAP2_Entry) {
+            return PEAR::raiseError('Parameter $entry is expected to be a Net_LDAP2_Entry object! (If DN was passed, conversion failed)');
+        }
+        if (null !== $target_ldap && !$target_ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError('Parameter $target_ldap is expected to be a Net_LDAP2 object!');
+        }
+
+        if ($target_ldap && $target_ldap !== $this) {
+            // cross directory move
+            if (is_string($entry)) {
+                return PEAR::raiseError('Unable to perform cross directory move: operation requires a Net_LDAP2_Entry object');
+            }
+            if ($target_ldap->dnExists($newdn)) {
+                return PEAR::raiseError('Unable to perform cross directory move: entry does exist in target directory');
+            }
+            $entry_o->dn($newdn);
+            $res = $target_ldap->add($entry_o);
+            if (self::isError($res)) {
+                return PEAR::raiseError('Unable to perform cross directory move: '.$res->getMessage().' in target directory');
+            }
+            $res = $this->delete($entry_o->currentDN());
+            if (self::isError($res)) {
+                $res2 = $target_ldap->delete($entry_o); // undo add
+                if (self::isError($res2)) {
+                    $add_error_string = 'Additionally, the deletion (undo add) of $entry in target directory failed.';
+                }
+                return PEAR::raiseError('Unable to perform cross directory move: '.$res->getMessage().' in source directory. '.$add_error_string);
+            }
+            $entry_o->setLDAP($target_ldap);
+            return true;
+        } else {
+            // local move
+            $entry_o->dn($newdn);
+            $entry_o->setLDAP($this);
+            return $entry_o->update();
+        }
+    }
+
+    /**
+    * Copy an entry to a new location
+    *
+    * The entry will be immediately copied.
+    * Please note that only attributes you have
+    * selected will be copied.
+    *
+    * @param Net_LDAP2_Entry &$entry Entry object
+    * @param string          $newdn  New FQF-DN of the entry
+    *
+    * @return Net_LDAP2_Error|Net_LDAP2_Entry Error Message or reference to the copied entry
+    */
+    public function &copy(&$entry, $newdn)
+    {
+        if (!$entry instanceof Net_LDAP2_Entry) {
+            return PEAR::raiseError('Parameter $entry is expected to be a Net_LDAP2_Entry object!');
+        }
+
+        $newentry = Net_LDAP2_Entry::createFresh($newdn, $entry->getValues());
+        $result   = $this->add($newentry);
+
+        if ($result instanceof Net_LDAP2_Error) {
+            return $result;
+        } else {
+            return $newentry;
+        }
+    }
+
+
+    /**
+    * Returns the string for an ldap errorcode.
+    *
+    * Made to be able to make better errorhandling
+    * Function based on DB::errorMessage()
+    * Tip: The best description of the errorcodes is found here:
+    * http://www.directory-info.com/LDAP2/LDAPErrorCodes.html
+    *
+    * @param int $errorcode Error code
+    *
+    * @return string The errorstring for the error.
+    */
+    public function errorMessage($errorcode)
+    {
+        $errorMessages = array(
+                              0x00 => "LDAP_SUCCESS",
+                              0x01 => "LDAP_OPERATIONS_ERROR",
+                              0x02 => "LDAP_PROTOCOL_ERROR",
+                              0x03 => "LDAP_TIMELIMIT_EXCEEDED",
+                              0x04 => "LDAP_SIZELIMIT_EXCEEDED",
+                              0x05 => "LDAP_COMPARE_FALSE",
+                              0x06 => "LDAP_COMPARE_TRUE",
+                              0x07 => "LDAP_AUTH_METHOD_NOT_SUPPORTED",
+                              0x08 => "LDAP_STRONG_AUTH_REQUIRED",
+                              0x09 => "LDAP_PARTIAL_RESULTS",
+                              0x0a => "LDAP_REFERRAL",
+                              0x0b => "LDAP_ADMINLIMIT_EXCEEDED",
+                              0x0c => "LDAP_UNAVAILABLE_CRITICAL_EXTENSION",
+                              0x0d => "LDAP_CONFIDENTIALITY_REQUIRED",
+                              0x0e => "LDAP_SASL_BIND_INPROGRESS",
+                              0x10 => "LDAP_NO_SUCH_ATTRIBUTE",
+                              0x11 => "LDAP_UNDEFINED_TYPE",
+                              0x12 => "LDAP_INAPPROPRIATE_MATCHING",
+                              0x13 => "LDAP_CONSTRAINT_VIOLATION",
+                              0x14 => "LDAP_TYPE_OR_VALUE_EXISTS",
+                              0x15 => "LDAP_INVALID_SYNTAX",
+                              0x20 => "LDAP_NO_SUCH_OBJECT",
+                              0x21 => "LDAP_ALIAS_PROBLEM",
+                              0x22 => "LDAP_INVALID_DN_SYNTAX",
+                              0x23 => "LDAP_IS_LEAF",
+                              0x24 => "LDAP_ALIAS_DEREF_PROBLEM",
+                              0x30 => "LDAP_INAPPROPRIATE_AUTH",
+                              0x31 => "LDAP_INVALID_CREDENTIALS",
+                              0x32 => "LDAP_INSUFFICIENT_ACCESS",
+                              0x33 => "LDAP_BUSY",
+                              0x34 => "LDAP_UNAVAILABLE",
+                              0x35 => "LDAP_UNWILLING_TO_PERFORM",
+                              0x36 => "LDAP_LOOP_DETECT",
+                              0x3C => "LDAP_SORT_CONTROL_MISSING",
+                              0x3D => "LDAP_INDEX_RANGE_ERROR",
+                              0x40 => "LDAP_NAMING_VIOLATION",
+                              0x41 => "LDAP_OBJECT_CLASS_VIOLATION",
+                              0x42 => "LDAP_NOT_ALLOWED_ON_NONLEAF",
+                              0x43 => "LDAP_NOT_ALLOWED_ON_RDN",
+                              0x44 => "LDAP_ALREADY_EXISTS",
+                              0x45 => "LDAP_NO_OBJECT_CLASS_MODS",
+                              0x46 => "LDAP_RESULTS_TOO_LARGE",
+                              0x47 => "LDAP_AFFECTS_MULTIPLE_DSAS",
+                              0x50 => "LDAP_OTHER",
+                              0x51 => "LDAP_SERVER_DOWN",
+                              0x52 => "LDAP_LOCAL_ERROR",
+                              0x53 => "LDAP_ENCODING_ERROR",
+                              0x54 => "LDAP_DECODING_ERROR",
+                              0x55 => "LDAP_TIMEOUT",
+                              0x56 => "LDAP_AUTH_UNKNOWN",
+                              0x57 => "LDAP_FILTER_ERROR",
+                              0x58 => "LDAP_USER_CANCELLED",
+                              0x59 => "LDAP_PARAM_ERROR",
+                              0x5a => "LDAP_NO_MEMORY",
+                              0x5b => "LDAP_CONNECT_ERROR",
+                              0x5c => "LDAP_NOT_SUPPORTED",
+                              0x5d => "LDAP_CONTROL_NOT_FOUND",
+                              0x5e => "LDAP_NO_RESULTS_RETURNED",
+                              0x5f => "LDAP_MORE_RESULTS_TO_RETURN",
+                              0x60 => "LDAP_CLIENT_LOOP",
+                              0x61 => "LDAP_REFERRAL_LIMIT_EXCEEDED",
+                              1000 => "Unknown Net_LDAP2 Error"
+                              );
+
+         return isset($errorMessages[$errorcode]) ?
+            $errorMessages[$errorcode] :
+            $errorMessages[NET_LDAP2_ERROR] . ' (' . $errorcode . ')';
+    }
+
+    /**
+    * Gets a rootDSE object
+    *
+    * This either fetches a fresh rootDSE object or returns it from
+    * the internal cache for performance reasons, if possible.
+    *
+    * @param array $attrs Array of attributes to search for
+    *
+    * @access public
+    * @return Net_LDAP2_Error|Net_LDAP2_RootDSE Net_LDAP2_Error or Net_LDAP2_RootDSE object
+    */
+    public function &rootDse($attrs = null)
+    {
+        if ($attrs !== null && !is_array($attrs)) {
+            return PEAR::raiseError('Parameter $attr is expected to be an array!');
+        }
+
+        $attrs_signature = serialize($attrs);
+
+        // see if we need to fetch a fresh object, or if we already
+        // requested this object with the same attributes
+        if (true || !array_key_exists($attrs_signature, $this->_rootDSE_cache)) {
+            $rootdse =& Net_LDAP2_RootDSE::fetch($this, $attrs);
+            if ($rootdse instanceof Net_LDAP2_Error) {
+                return $rootdse;
+            }
+
+            // search was ok, store rootDSE in cache
+            $this->_rootDSE_cache[$attrs_signature] = $rootdse;
+        }
+        return $this->_rootDSE_cache[$attrs_signature];
+    }
+
+    /**
+    * Alias function of rootDse() for perl-ldap interface
+    *
+    * @access public
+    * @see rootDse()
+    * @return Net_LDAP2_Error|Net_LDAP2_RootDSE
+    */
+    public function &root_dse()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, 'rootDse'), $args);
+    }
+
+    /**
+    * Get a schema object
+    *
+    * @param string $dn (optional) Subschema entry dn
+    *
+    * @access public
+    * @return Net_LDAP2_Schema|Net_LDAP2_Error  Net_LDAP2_Schema or Net_LDAP2_Error object
+    */
+    public function &schema($dn = null)
+    {
+        // Schema caching by Knut-Olav Hoven
+        // If a schema caching object is registered, we use that to fetch
+        // a schema object.
+        // See registerSchemaCache() for more info on this.
+        if ($this->_schema === null) {
+            if ($this->_schema_cache) {
+               $cached_schema = $this->_schema_cache->loadSchema();
+               if ($cached_schema instanceof Net_LDAP2_Error) {
+                   return $cached_schema; // route error to client
+               } else {
+                   if ($cached_schema instanceof Net_LDAP2_Schema) {
+                       $this->_schema = $cached_schema;
+                   }
+               }
+            }
+        }
+
+        // Fetch schema, if not tried before and no cached version available.
+        // If we are already fetching the schema, we will skip fetching.
+        if ($this->_schema === null) {
+            // store a temporary error message so subsequent calls to schema() can
+            // detect, that we are fetching the schema already.
+            // Otherwise we will get an infinite loop at Net_LDAP2_Schema::fetch()
+            $this->_schema = new Net_LDAP2_Error('Schema not initialized');
+            $this->_schema = Net_LDAP2_Schema::fetch($this, $dn);
+
+            // If schema caching is active, advise the cache to store the schema
+            if ($this->_schema_cache) {
+                $caching_result = $this->_schema_cache->storeSchema($this->_schema);
+                if ($caching_result instanceof Net_LDAP2_Error) {
+                    return $caching_result; // route error to client
+                }
+            }
+        }
+        return $this->_schema;
+    }
+
+    /**
+    * Enable/disable persistent schema caching
+    *
+    * Sometimes it might be useful to allow your scripts to cache
+    * the schema information on disk, so the schema is not fetched
+    * every time the script runs which could make your scripts run
+    * faster.
+    *
+    * This method allows you to register a custom object that
+    * implements your schema cache. Please see the SchemaCache interface
+    * (SchemaCache.interface.php) for informations on how to implement this.
+    * To unregister the cache, pass null as $cache parameter.
+    *
+    * For ease of use, Net_LDAP2 provides a simple file based cache
+    * which is used in the example below. You may use this, for example,
+    * to store the schema in a linux tmpfs which results in the schema
+    * beeing cached inside the RAM which allows nearly instant access.
+    * <code>
+    *    // Create the simple file cache object that comes along with Net_LDAP2
+    *    $mySchemaCache_cfg = array(
+    *      'path'    =>  '/tmp/Net_LDAP2_Schema.cache',
+    *      'max_age' =>  86400   // max age is 24 hours (in seconds)
+    *    );
+    *    $mySchemaCache = new Net_LDAP2_SimpleFileSchemaCache($mySchemaCache_cfg);
+    *    $ldap = new Net_LDAP2::connect(...);
+    *    $ldap->registerSchemaCache($mySchemaCache); // enable caching
+    *    // now each call to $ldap->schema() will get the schema from disk!
+    * </code>
+    *
+    * @param Net_LDAP2_SchemaCache|null $cache Object implementing the Net_LDAP2_SchemaCache interface
+    *
+    * @return true|Net_LDAP2_Error
+    */
+    public function registerSchemaCache($cache) {
+        if (is_null($cache)
+        || (is_object($cache) && in_array('Net_LDAP2_SchemaCache', class_implements($cache))) ) {
+            $this->_schema_cache = $cache;
+            return true;
+        } else {
+            return new Net_LDAP2_Error('Custom schema caching object is either no '.
+                'valid object or does not implement the Net_LDAP2_SchemaCache interface!');
+        }
+    }
+
+
+    /**
+    * Checks if phps ldap-extension is loaded
+    *
+    * If it is not loaded, it tries to load it manually using PHPs dl().
+    * It knows both windows-dll and *nix-so.
+    *
+    * @static
+    * @return Net_LDAP2_Error|true
+    */
+    public static function checkLDAPExtension()
+    {
+        if (!extension_loaded('ldap') && !@dl('ldap.' . PHP_SHLIB_SUFFIX)) {
+            return new Net_LDAP2_Error("It seems that you do not have the ldap-extension installed. Please install it before using the Net_LDAP2 package.");
+        } else {
+            return true;
+        }
+    }
+
+    /**
+    * Encodes given attributes to UTF8 if needed by schema
+    *
+    * This function takes attributes in an array and then checks against the schema if they need
+    * UTF8 encoding. If that is so, they will be encoded. An encoded array will be returned and
+    * can be used for adding or modifying.
+    *
+    * $attributes is expected to be an array with keys describing
+    * the attribute names and the values as the value of this attribute:
+    * <code>$attributes = array('cn' => 'foo', 'attr2' => array('mv1', 'mv2'));</code>
+    *
+    * @param array $attributes Array of attributes
+    *
+    * @access public
+    * @return array|Net_LDAP2_Error Array of UTF8 encoded attributes or Error
+    */
+    public function utf8Encode($attributes)
+    {
+        return $this->utf8($attributes, 'utf8_encode');
+    }
+
+    /**
+    * Decodes the given attribute values if needed by schema
+    *
+    * $attributes is expected to be an array with keys describing
+    * the attribute names and the values as the value of this attribute:
+    * <code>$attributes = array('cn' => 'foo', 'attr2' => array('mv1', 'mv2'));</code>
+    *
+    * @param array $attributes Array of attributes
+    *
+    * @access public
+    * @see utf8Encode()
+    * @return array|Net_LDAP2_Error Array with decoded attribute values or Error
+    */
+    public function utf8Decode($attributes)
+    {
+        return $this->utf8($attributes, 'utf8_decode');
+    }
+
+    /**
+    * Encodes or decodes attribute values if needed
+    *
+    * @param array $attributes Array of attributes
+    * @param array $function   Function to apply to attribute values
+    *
+    * @access protected
+    * @return array|Net_LDAP2_Error Array of attributes with function applied to values or Error
+    */
+    protected function utf8($attributes, $function)
+    {
+        if (!is_array($attributes) || array_key_exists(0, $attributes)) {
+            return PEAR::raiseError('Parameter $attributes is expected to be an associative array');
+        }
+
+        if (!$this->_schema) {
+            $this->_schema = $this->schema();
+        }
+
+        if (!$this->_link || self::isError($this->_schema) || !function_exists($function)) {
+            return $attributes;
+        }
+
+        if (is_array($attributes) && count($attributes) > 0) {
+
+            foreach ($attributes as $k => $v) {
+
+                if (!isset($this->_schemaAttrs[$k])) {
+
+                    $attr = $this->_schema->get('attribute', $k);
+                    if (self::isError($attr)) {
+                        continue;
+                    }
+
+                    if (false !== strpos($attr['syntax'], '1.3.6.1.4.1.1466.115.121.1.15')) {
+                        $encode = true;
+                    } else {
+                        $encode = false;
+                    }
+                    $this->_schemaAttrs[$k] = $encode;
+
+                } else {
+                    $encode = $this->_schemaAttrs[$k];
+                }
+
+                if ($encode) {
+                    if (is_array($v)) {
+                        foreach ($v as $ak => $av) {
+                            $v[$ak] = call_user_func($function, $av);
+                        }
+                    } else {
+                        $v = call_user_func($function, $v);
+                    }
+                }
+                $attributes[$k] = $v;
+            }
+        }
+        return $attributes;
+    }
+
+    /**
+    * Get the LDAP link resource.  It will loop attempting to
+    * re-establish the connection if the connection attempt fails and
+    * auto_reconnect has been turned on (see the _config array documentation).
+    *
+    * @access public
+    * @return resource LDAP link
+    */
+    public function &getLink()
+    {
+        if ($this->_config['auto_reconnect']) {
+            while (true) {
+                //
+                // Return the link handle if we are already connected.  Otherwise
+                // try to reconnect.
+                //
+                if ($this->_link !== false) {
+                    return $this->_link;
+                } else {
+                    $this->performReconnect();
+                }
+            }
+        }
+        return $this->_link;
+    }
+}
+
+/**
+* Net_LDAP2_Error implements a class for reporting portable LDAP error messages.
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Tarjej Huse <tarjei@bergfald.no>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_Error extends PEAR_Error
+{
+    /**
+     * Net_LDAP2_Error constructor.
+     *
+     * @param string  $message   String with error message.
+     * @param integer $code      Net_LDAP2 error code
+     * @param integer $mode      what "error mode" to operate in
+     * @param mixed   $level     what error level to use for $mode & PEAR_ERROR_TRIGGER
+     * @param mixed   $debuginfo additional debug info, such as the last query
+     *
+     * @access public
+     * @see PEAR_Error
+     */
+    public function __construct($message = 'Net_LDAP2_Error', $code = NET_LDAP2_ERROR, $mode = PEAR_ERROR_RETURN,
+                         $level = E_USER_NOTICE, $debuginfo = null)
+    {
+        if (is_int($code)) {
+            $this->PEAR_Error($message . ': ' . Net_LDAP2::errorMessage($code), $code, $mode, $level, $debuginfo);
+        } else {
+            $this->PEAR_Error("$message: $code", NET_LDAP2_ERROR, $mode, $level, $debuginfo);
+        }
+    }
+}
+
+?>
diff --git a/extlib/Net/LDAP2/Entry.php b/extlib/Net/LDAP2/Entry.php
new file mode 100644
index 000000000..66de96678
--- /dev/null
+++ b/extlib/Net/LDAP2/Entry.php
@@ -0,0 +1,1055 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Entry interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Tarjej Huse, Jan Wagner, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: Entry.php 286787 2009-08-04 06:03:12Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+require_once 'Util.php';
+
+/**
+* Object representation of a directory entry
+*
+* This class represents a directory entry. You can add, delete, replace
+* attributes and their values, rename the entry, delete the entry.
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Jan Wagner <wagner@netsols.de>
+* @author   Tarjej Huse <tarjei@bergfald.no>
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP2/
+*/
+class Net_LDAP2_Entry extends PEAR
+{
+    /**
+    * Entry ressource identifier
+    *
+    * @access protected
+    * @var ressource
+    */
+    protected $_entry = null;
+
+    /**
+    * LDAP ressource identifier
+    *
+    * @access protected
+    * @var ressource
+    */
+    protected $_link = null;
+
+    /**
+    * Net_LDAP2 object
+    *
+    * This object will be used for updating and schema checking
+    *
+    * @access protected
+    * @var object Net_LDAP2
+    */
+    protected $_ldap = null;
+
+    /**
+    * Distinguished name of the entry
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_dn = null;
+
+    /**
+    * Attributes
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_attributes = array();
+
+    /**
+    * Original attributes before any modification
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_original = array();
+
+
+    /**
+    * Map of attribute names
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_map = array();
+
+
+    /**
+    * Is this a new entry?
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_new = true;
+
+    /**
+    * New distinguished name
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_newdn = null;
+
+    /**
+    * Shall the entry be deleted?
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_delete = false;
+
+    /**
+    * Map with changes to the entry
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_changes = array("add"     => array(),
+                                "delete"  => array(),
+                                "replace" => array()
+                               );
+    /**
+    * Internal Constructor
+    *
+    * Constructor of the entry. Sets up the distinguished name and the entries
+    * attributes.
+    * You should not call this method manually! Use {@link Net_LDAP2_Entry::createFresh()}
+    * or {@link Net_LDAP2_Entry::createConnected()} instead!
+    *
+    * @param Net_LDAP2|ressource|array &$ldap Net_LDAP2 object, ldap-link ressource or array of attributes
+    * @param string|ressource          $entry Either a DN or a LDAP-Entry ressource
+    *
+    * @access protected
+    * @return none
+    */
+    protected function __construct(&$ldap, $entry = null)
+    {
+        $this->PEAR('Net_LDAP2_Error');
+
+        // set up entry resource or DN
+        if (is_resource($entry)) {
+            $this->_entry = &$entry;
+        } else {
+            $this->_dn = $entry;
+        }
+
+        // set up LDAP link
+        if ($ldap instanceof Net_LDAP2) {
+            $this->_ldap = &$ldap;
+            $this->_link = $ldap->getLink();
+        } elseif (is_resource($ldap)) {
+            $this->_link = $ldap;
+        } elseif (is_array($ldap)) {
+            // Special case: here $ldap is an array of attributes,
+            // this means, we have no link. This is a "virtual" entry.
+            // We just set up the attributes so one can work with the object
+            // as expected, but an update() fails unless setLDAP() is called.
+            $this->setAttributes($ldap);
+        }
+
+        // if this is an entry existing in the directory,
+        // then set up as old and fetch attrs
+        if (is_resource($this->_entry) && is_resource($this->_link)) {
+            $this->_new = false;
+            $this->_dn  = @ldap_get_dn($this->_link, $this->_entry);
+            $this->setAttributes();  // fetch attributes from server
+        }
+    }
+
+    /**
+    * Creates a fresh entry that may be added to the directory later on
+    *
+    * Use this method, if you want to initialize a fresh entry.
+    *
+    * The method should be called statically: $entry = Net_LDAP2_Entry::createFresh();
+    * You should put a 'objectClass' attribute into the $attrs so the directory server
+    * knows which object you want to create. However, you may omit this in case you
+    * don't want to add this entry to a directory server.
+    *
+    * The attributes parameter is as following:
+    * <code>
+    * $attrs = array( 'attribute1' => array('value1', 'value2'),
+    *                 'attribute2' => 'single value'
+    *          );
+    * </code>
+    *
+    * @param string $dn    DN of the Entry
+    * @param array  $attrs Attributes of the entry
+    *
+    * @static
+    * @return Net_LDAP2_Entry|Net_LDAP2_Error
+    */
+    public static function createFresh($dn, $attrs = array())
+    {
+        if (!is_array($attrs)) {
+            return PEAR::raiseError("Unable to create fresh entry: Parameter \$attrs needs to be an array!");
+        }
+
+        $entry = new Net_LDAP2_Entry($attrs, $dn);
+        return $entry;
+    }
+
+    /**
+    * Creates a Net_LDAP2_Entry object out of an ldap entry resource
+    *
+    * Use this method, if you want to initialize an entry object that is
+    * already present in some directory and that you have read manually.
+    *
+    * Please note, that if you want to create an entry object that represents
+    * some already existing entry, you should use {@link createExisting()}.
+    *
+    * The method should be called statically: $entry = Net_LDAP2_Entry::createConnected();
+    *
+    * @param Net_LDAP2 $ldap  Net_LDA2 object
+    * @param resource  $entry PHP LDAP entry resource
+    *
+    * @static
+    * @return Net_LDAP2_Entry|Net_LDAP2_Error
+    */
+    public static function createConnected($ldap, $entry)
+    {
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("Unable to create connected entry: Parameter \$ldap needs to be a Net_LDAP2 object!");
+        }
+        if (!is_resource($entry)) {
+            return PEAR::raiseError("Unable to create connected entry: Parameter \$entry needs to be a ldap entry resource!");
+        }
+
+        $entry = new Net_LDAP2_Entry($ldap, $entry);
+        return $entry;
+    }
+
+    /**
+    * Creates an Net_LDAP2_Entry object that is considered already existing
+    *
+    * Use this method, if you want to modify an already existing entry
+    * without fetching it first.
+    * In most cases however, it is better to fetch the entry via Net_LDAP2->getEntry()!
+    *
+    * Please note that you should take care if you construct entries manually with this
+    * because you may get weird synchronisation problems.
+    * The attributes and values as well as the entry itself are considered existent
+    * which may produce errors if you try to modify an entry which doesn't really exist
+    * or if you try to overwrite some attribute with an value already present.
+    *
+    * This method is equal to calling createFresh() and after that markAsNew(FALSE).
+    *
+    * The method should be called statically: $entry = Net_LDAP2_Entry::createExisting();
+    *
+    * The attributes parameter is as following:
+    * <code>
+    * $attrs = array( 'attribute1' => array('value1', 'value2'),
+    *                 'attribute2' => 'single value'
+    *          );
+    * </code>
+    *
+    * @param string $dn    DN of the Entry
+    * @param array  $attrs Attributes of the entry
+    *
+    * @static
+    * @return Net_LDAP2_Entry|Net_LDAP2_Error
+    */
+    public static function createExisting($dn, $attrs = array())
+    {
+        if (!is_array($attrs)) {
+            return PEAR::raiseError("Unable to create entry object: Parameter \$attrs needs to be an array!");
+        }
+
+        $entry = Net_LDAP2_Entry::createFresh($dn, $attrs);
+        if ($entry instanceof Net_LDAP2_Error) {
+            return $entry;
+        } else {
+            $entry->markAsNew(false);
+            return $entry;
+        }
+    }
+
+    /**
+    * Get or set the distinguished name of the entry
+    *
+    * If called without an argument the current (or the new DN if set) DN gets returned.
+    * If you provide an DN, this entry is moved to the new location specified if a DN existed.
+    * If the DN was not set, the DN gets initialized. Call {@link update()} to actually create
+    * the new Entry in the directory.
+    * To fetch the current active DN after setting a new DN but before an update(), you can use
+    * {@link currentDN()} to retrieve the DN that is currently active.
+    *
+    * Please note that special characters (eg german umlauts) should be encoded using utf8_encode().
+    * You may use {@link Net_LDAP2_Util::canonical_dn()} for properly encoding of the DN.
+    *
+    * @param string $dn New distinguished name
+    *
+    * @access public
+    * @return string|true Distinguished name (or true if a new DN was provided)
+    */
+    public function dn($dn = null)
+    {
+        if (false == is_null($dn)) {
+            if (is_null($this->_dn)) {
+                $this->_dn = $dn;
+            } else {
+                $this->_newdn = $dn;
+            }
+            return true;
+        }
+        return (isset($this->_newdn) ? $this->_newdn : $this->currentDN());
+    }
+
+    /**
+    * Renames or moves the entry
+    *
+    * This is just a convinience alias to {@link dn()}
+    * to make your code more meaningful.
+    *
+    * @param string $newdn The new DN
+    *
+    * @return true
+    */
+    public function move($newdn)
+    {
+        return $this->dn($newdn);
+    }
+
+    /**
+    * Sets the internal attributes array
+    *
+    * This fetches the values for the attributes from the server.
+    * The attribute Syntax will be checked so binary attributes will be returned
+    * as binary values.
+    *
+    * Attributes may be passed directly via the $attributes parameter to setup this
+    * entry manually. This overrides attribute fetching from the server.
+    *
+    * @param array $attributes Attributes to set for this entry
+    *
+    * @access protected
+    * @return void
+    */
+    protected function setAttributes($attributes = null)
+    {
+        /*
+        * fetch attributes from the server
+        */
+        if (is_null($attributes) && is_resource($this->_entry) && is_resource($this->_link)) {
+            // fetch schema
+            if ($this->_ldap instanceof Net_LDAP2) {
+                $schema =& $this->_ldap->schema();
+            }
+            // fetch attributes
+            $attributes = array();
+            do {
+                if (empty($attr)) {
+                    $ber  = null;
+                    $attr = @ldap_first_attribute($this->_link, $this->_entry, $ber);
+                } else {
+                    $attr = @ldap_next_attribute($this->_link, $this->_entry, $ber);
+                }
+                if ($attr) {
+                    $func = 'ldap_get_values'; // standard function to fetch value
+
+                    // Try to get binary values as binary data
+                    if ($schema instanceof Net_LDAP2_Schema) {
+                        if ($schema->isBinary($attr)) {
+                             $func = 'ldap_get_values_len';
+                        }
+                    }
+                    // fetch attribute value (needs error checking?)
+                    $attributes[$attr] = $func($this->_link, $this->_entry, $attr);
+                }
+            } while ($attr);
+        }
+
+        /*
+        * set attribute data directly, if passed
+        */
+        if (is_array($attributes) && count($attributes) > 0) {
+            if (isset($attributes["count"]) && is_numeric($attributes["count"])) {
+                unset($attributes["count"]);
+            }
+            foreach ($attributes as $k => $v) {
+                // attribute names should not be numeric
+                if (is_numeric($k)) {
+                    continue;
+                }
+                // map generic attribute name to real one
+                $this->_map[strtolower($k)] = $k;
+                // attribute values should be in an array
+                if (false == is_array($v)) {
+                    $v = array($v);
+                }
+                // remove the value count (comes from ldap server)
+                if (isset($v["count"])) {
+                    unset($v["count"]);
+                }
+                $this->_attributes[$k] = $v;
+            }
+        }
+
+        // save a copy for later use
+        $this->_original = $this->_attributes;
+    }
+
+    /**
+    * Get the values of all attributes in a hash
+    *
+    * The returned hash has the form
+    * <code>array('attributename' => 'single value',
+    *       'attributename' => array('value1', value2', value3'))</code>
+    *
+    * @access public
+    * @return array Hash of all attributes with their values
+    */
+    public function getValues()
+    {
+        $attrs = array();
+        foreach ($this->_attributes as $attr => $value) {
+            $attrs[$attr] = $this->getValue($attr);
+        }
+        return $attrs;
+    }
+
+    /**
+    * Get the value of a specific attribute
+    *
+    * The first parameter is the name of the attribute
+    * The second parameter influences the way the value is returned:
+    * 'single': only the first value is returned as string
+    * 'all': all values including the value count are returned in an
+    *               array
+    * 'default': in all other cases an attribute value with a single value is
+    *            returned as string, if it has multiple values it is returned
+    *            as an array (without value count)
+    *
+    * @param string $attr   Attribute name
+    * @param string $option Option
+    *
+    * @access public
+    * @return string|array|PEAR_Error string, array or PEAR_Error
+    */
+    public function getValue($attr, $option = null)
+    {
+        $attr = $this->getAttrName($attr);
+
+        if (false == array_key_exists($attr, $this->_attributes)) {
+            return PEAR::raiseError("Unknown attribute ($attr) requested");
+        }
+
+        $value = $this->_attributes[$attr];
+
+        if ($option == "single" || (count($value) == 1 && $option != 'all')) {
+            $value = array_shift($value);
+        }
+
+        return $value;
+    }
+
+    /**
+    * Alias function of getValue for perl-ldap interface
+    *
+    * @see getValue()
+    * @return string|array|PEAR_Error
+    */
+    public function get_value()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'getValue' ), $args);
+    }
+
+    /**
+    * Returns an array of attributes names
+    *
+    * @access public
+    * @return array Array of attribute names
+    */
+    public function attributes()
+    {
+        return array_keys($this->_attributes);
+    }
+
+    /**
+    * Returns whether an attribute exists or not
+    *
+    * @param string $attr Attribute name
+    *
+    * @access public
+    * @return boolean
+    */
+    public function exists($attr)
+    {
+        $attr = $this->getAttrName($attr);
+        return array_key_exists($attr, $this->_attributes);
+    }
+
+    /**
+    * Adds a new attribute or a new value to an existing attribute
+    *
+    * The paramter has to be an array of the form:
+    * array('attributename' => 'single value',
+    *       'attributename' => array('value1', 'value2))
+    * When the attribute already exists the values will be added, else the
+    * attribute will be created. These changes are local to the entry and do
+    * not affect the entry on the server until update() is called.
+    *
+    * Note, that you can add values of attributes that you haven't selected, but if
+    * you do so, {@link getValue()} and {@link getValues()} will only return the
+    * values you added, _NOT_ all values present on the server. To avoid this, just refetch
+    * the entry after calling {@link update()} or select the attribute.
+    *
+    * @param array $attr Attributes to add
+    *
+    * @access public
+    * @return true|Net_LDAP2_Error
+    */
+    public function add($attr = array())
+    {
+        if (false == is_array($attr)) {
+            return PEAR::raiseError("Parameter must be an array");
+        }
+        foreach ($attr as $k => $v) {
+            $k = $this->getAttrName($k);
+            if (false == is_array($v)) {
+                // Do not add empty values
+                if ($v == null) {
+                    continue;
+                } else {
+                    $v = array($v);
+                }
+            }
+            // add new values to existing attribute or add new attribute
+            if ($this->exists($k)) {
+                $this->_attributes[$k] = array_unique(array_merge($this->_attributes[$k], $v));
+            } else {
+                $this->_map[strtolower($k)] = $k;
+                $this->_attributes[$k]      = $v;
+            }
+            // save changes for update()
+            if (empty($this->_changes["add"][$k])) {
+                $this->_changes["add"][$k] = array();
+            }
+            $this->_changes["add"][$k] = array_unique(array_merge($this->_changes["add"][$k], $v));
+        }
+        $return = true;
+        return $return;
+    }
+
+    /**
+    * Deletes an whole attribute or a value or the whole entry
+    *
+    * The parameter can be one of the following:
+    *
+    * "attributename" - The attribute as a whole will be deleted
+    * array("attributename1", "attributename2) - All given attributes will be
+    *                                            deleted
+    * array("attributename" => "value") - The value will be deleted
+    * array("attributename" => array("value1", "value2") - The given values
+    *                                                      will be deleted
+    * If $attr is null or omitted , then the whole Entry will be deleted!
+    *
+    * These changes are local to the entry and do
+    * not affect the entry on the server until {@link update()} is called.
+    *
+    * Please note that you must select the attribute (at $ldap->search() for example)
+    * to be able to delete values of it, Otherwise {@link update()} will silently fail
+    * and remove nothing.
+    *
+    * @param string|array $attr Attributes to delete (NULL or missing to delete whole entry)
+    *
+    * @access public
+    * @return true
+    */
+    public function delete($attr = null)
+    {
+        if (is_null($attr)) {
+            $this->_delete = true;
+            return true;
+        }
+        if (is_string($attr)) {
+            $attr = array($attr);
+        }
+        // Make the assumption that attribute names cannot be numeric,
+        // therefore this has to be a simple list of attribute names to delete
+        if (is_numeric(key($attr))) {
+            foreach ($attr as $name) {
+                if (is_array($name)) {
+                    // someone mixed modes (list mode but specific values given!)
+                    $del_attr_name = array_search($name, $attr);
+                    $this->delete(array($del_attr_name => $name));
+                } else {
+                    // mark for update() if this attr was not marked before
+                    $name = $this->getAttrName($name);
+                    if ($this->exists($name)) {
+                        $this->_changes["delete"][$name] = null;
+                        unset($this->_attributes[$name]);
+                    }
+                }
+            }
+        } else {
+            // Here we have a hash with "attributename" => "value to delete"
+            foreach ($attr as $name => $values) {
+                if (is_int($name)) {
+                    // someone mixed modes and gave us just an attribute name
+                    $this->delete($values);
+                } else {
+                    // mark for update() if this attr was not marked before;
+                    // this time it must consider the selected values also
+                    $name = $this->getAttrName($name);
+                    if ($this->exists($name)) {
+                        if (false == is_array($values)) {
+                            $values = array($values);
+                        }
+                        // save values to be deleted
+                        if (empty($this->_changes["delete"][$name])) {
+                            $this->_changes["delete"][$name] = array();
+                        }
+                        $this->_changes["delete"][$name] =
+                            array_unique(array_merge($this->_changes["delete"][$name], $values));
+                        foreach ($values as $value) {
+                            // find the key for the value that should be deleted
+                            $key = array_search($value, $this->_attributes[$name]);
+                            if (false !== $key) {
+                                // delete the value
+                                unset($this->_attributes[$name][$key]);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        $return = true;
+        return $return;
+    }
+
+    /**
+    * Replaces attributes or its values
+    *
+    * The parameter has to an array of the following form:
+    * array("attributename" => "single value",
+    *       "attribute2name" => array("value1", "value2"),
+    *       "deleteme1" => null,
+    *       "deleteme2" => "")
+    * If the attribute does not yet exist it will be added instead (see also $force).
+    * If the attribue value is null, the attribute will de deleted.
+    *
+    * These changes are local to the entry and do
+    * not affect the entry on the server until {@link update()} is called.
+    *
+    * In some cases you are not allowed to read the attributes value (for
+    * example the ActiveDirectory attribute unicodePwd) but are allowed to
+    * replace the value. In this case replace() would assume that the attribute
+    * is not in the directory yet and tries to add it which will result in an
+    * LDAP_TYPE_OR_VALUE_EXISTS error.
+    * To force replace mode instead of add, you can set $force to true.
+    *
+    * @param array $attr  Attributes to replace
+    * @param bool  $force Force replacing mode in case we can't read the attr value but are allowed to replace it
+    *
+    * @access public
+    * @return true|Net_LDAP2_Error
+    */
+    public function replace($attr = array(), $force = false)
+    {
+        if (false == is_array($attr)) {
+            return PEAR::raiseError("Parameter must be an array");
+        }
+        foreach ($attr as $k => $v) {
+            $k = $this->getAttrName($k);
+            if (false == is_array($v)) {
+                // delete attributes with empty values; treat ints as string
+                if (is_int($v)) {
+                    $v = "$v";
+                }
+                if ($v == null) {
+                    $this->delete($k);
+                    continue;
+                } else {
+                    $v = array($v);
+                }
+            }
+            // existing attributes will get replaced
+            if ($this->exists($k) || $force) {
+                $this->_changes["replace"][$k] = $v;
+                $this->_attributes[$k]         = $v;
+            } else {
+                // new ones just get added
+                $this->add(array($k => $v));
+            }
+        }
+        $return = true;
+        return $return;
+    }
+
+    /**
+    * Update the entry on the directory server
+    *
+    * This will evaluate all changes made so far and send them
+    * to the directory server.
+    * Please note, that if you make changes to objectclasses wich
+    * have mandatory attributes set, update() will currently fail.
+    * Remove the entry from the server and readd it as new in such cases.
+    * This also will deal with problems with setting structural object classes.
+    *
+    * @param Net_LDAP2 $ldap If passed, a call to setLDAP() is issued prior update, thus switching the LDAP-server. This is for perl-ldap interface compliance
+    *
+    * @access public
+    * @return true|Net_LDAP2_Error
+    * @todo Entry rename with a DN containing special characters needs testing!
+    */
+    public function update($ldap = null)
+    {
+        if ($ldap) {
+            $msg = $this->setLDAP($ldap);
+            if (Net_LDAP2::isError($msg)) {
+                return PEAR::raiseError('You passed an invalid $ldap variable to update()');
+            }
+        }
+
+        // ensure we have a valid LDAP object
+        $ldap =& $this->getLDAP();
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("The entries LDAP object is not valid");
+        }
+
+        // Get and check link
+        $link = $ldap->getLink();
+        if (!is_resource($link)) {
+            return PEAR::raiseError("Could not update entry: internal LDAP link is invalid");
+        }
+
+        /*
+        * Delete the entry
+        */
+        if (true === $this->_delete) {
+            return $ldap->delete($this);
+        }
+
+        /*
+        * New entry
+        */
+        if (true === $this->_new) {
+            $msg = $ldap->add($this);
+            if (Net_LDAP2::isError($msg)) {
+                return $msg;
+            }
+            $this->_new                = false;
+            $this->_changes['add']     = array();
+            $this->_changes['delete']  = array();
+            $this->_changes['replace'] = array();
+            $this->_original           = $this->_attributes;
+
+            $return = true;
+            return $return;
+        }
+
+        /*
+        * Rename/move entry
+        */
+        if (false == is_null($this->_newdn)) {
+            if ($ldap->getLDAPVersion() !== 3) {
+                return PEAR::raiseError("Renaming/Moving an entry is only supported in LDAPv3");
+            }
+            // make dn relative to parent (needed for ldap rename)
+            $parent = Net_LDAP2_Util::ldap_explode_dn($this->_newdn, array('casefolding' => 'none', 'reverse' => false, 'onlyvalues' => false));
+            if (Net_LDAP2::isError($parent)) {
+                return $parent;
+            }
+            $child = array_shift($parent);
+            // maybe the dn consist of a multivalued RDN, we must build the dn in this case
+            // because the $child-RDN is an array!
+            if (is_array($child)) {
+                $child = Net_LDAP2_Util::canonical_dn($child);
+            }
+            $parent = Net_LDAP2_Util::canonical_dn($parent);
+
+            // rename/move
+            if (false == @ldap_rename($link, $this->_dn, $child, $parent, true)) {
+                return PEAR::raiseError("Entry not renamed: " .
+                                        @ldap_error($link), @ldap_errno($link));
+            }
+            // reflect changes to local copy
+            $this->_dn    = $this->_newdn;
+            $this->_newdn = null;
+        }
+
+        /*
+        * Carry out modifications to the entry
+        */
+        // ADD
+        foreach ($this->_changes["add"] as $attr => $value) {
+            // if attribute exists, add new values
+            if ($this->exists($attr)) {
+                if (false === @ldap_mod_add($link, $this->dn(), array($attr => $value))) {
+                    return PEAR::raiseError("Could not add new values to attribute $attr: " .
+                                            @ldap_error($link), @ldap_errno($link));
+                }
+            } else {
+                // new attribute
+                if (false === @ldap_modify($link, $this->dn(), array($attr => $value))) {
+                    return PEAR::raiseError("Could not add new attribute $attr: " .
+                                            @ldap_error($link), @ldap_errno($link));
+                }
+            }
+            // all went well here, I guess
+            unset($this->_changes["add"][$attr]);
+        }
+
+        // DELETE
+        foreach ($this->_changes["delete"] as $attr => $value) {
+            // In LDAPv3 you need to specify the old values for deleting
+            if (is_null($value) && $ldap->getLDAPVersion() === 3) {
+                $value = $this->_original[$attr];
+            }
+            if (false === @ldap_mod_del($link, $this->dn(), array($attr => $value))) {
+                return PEAR::raiseError("Could not delete attribute $attr: " .
+                                        @ldap_error($link), @ldap_errno($link));
+            }
+            unset($this->_changes["delete"][$attr]);
+        }
+
+        // REPLACE
+        foreach ($this->_changes["replace"] as $attr => $value) {
+            if (false === @ldap_modify($link, $this->dn(), array($attr => $value))) {
+                return PEAR::raiseError("Could not replace attribute $attr values: " .
+                                        @ldap_error($link), @ldap_errno($link));
+            }
+            unset($this->_changes["replace"][$attr]);
+        }
+
+        // all went well, so _original (server) becomes _attributes (local copy)
+        $this->_original = $this->_attributes;
+
+        $return = true;
+        return $return;
+    }
+
+    /**
+    * Returns the right attribute name
+    *
+    * @param string $attr Name of attribute
+    *
+    * @access protected
+    * @return string The right name of the attribute
+    */
+    protected function getAttrName($attr)
+    {
+        $name = strtolower($attr);
+        if (array_key_exists($name, $this->_map)) {
+            $attr = $this->_map[$name];
+        }
+        return $attr;
+    }
+
+    /**
+    * Returns a reference to the LDAP-Object of this entry
+    *
+    * @access public
+    * @return Net_LDAP2|Net_LDAP2_Error   Reference to the Net_LDAP2 Object (the connection) or Net_LDAP2_Error
+    */
+    public function &getLDAP()
+    {
+        if (!$this->_ldap instanceof Net_LDAP2) {
+            $err = new PEAR_Error('LDAP is not a valid Net_LDAP2 object');
+            return $err;
+        } else {
+            return $this->_ldap;
+        }
+    }
+
+    /**
+    * Sets a reference to the LDAP-Object of this entry
+    *
+    * After setting a Net_LDAP2 object, calling update() will use that object for
+    * updating directory contents. Use this to dynamicly switch directorys.
+    *
+    * @param Net_LDAP2 &$ldap Net_LDAP2 object that this entry should be connected to
+    *
+    * @access public
+    * @return true|Net_LDAP2_Error
+    */
+    public function setLDAP(&$ldap)
+    {
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("LDAP is not a valid Net_LDAP2 object");
+        } else {
+            $this->_ldap =& $ldap;
+            return true;
+        }
+    }
+
+    /**
+    * Marks the entry as new/existing.
+    *
+    * If an Entry is marked as new, it will be added to the directory
+    * when calling {@link update()}.
+    * If the entry is marked as old ($mark = false), then the entry is
+    * assumed to be present in the directory server wich results in
+    * modification when calling {@link update()}.
+    *
+    * @param boolean $mark Value to set, defaults to "true"
+    *
+    * @return void
+    */
+    public function markAsNew($mark = true)
+    {
+        $this->_new = ($mark)? true : false;
+    }
+
+    /**
+    * Applies a regular expression onto a single- or multivalued attribute (like preg_match())
+    *
+    * This method behaves like PHPs preg_match() but with some exceptions.
+    * If you want to retrieve match information, then you MUST pass the
+    * $matches parameter via reference! otherwise you will get no matches.
+    * Since it is possible to have multi valued attributes the $matches
+    * array will have a additionally numerical dimension (one for each value):
+    * <code>
+    * $matches = array(
+    *         0 => array (usual preg_match() returnarray),
+    *         1 => array (usual preg_match() returnarray)
+    *     )
+    * </code>
+    * Please note, that $matches will be initialized to an empty array inside.
+    *
+    * Usage example:
+    * <code>
+    * $result = $entry->preg_match('/089(\d+)/', 'telephoneNumber', &$matches);
+    * if ( $result === true ){
+    *     echo "First match: ".$matches[0][1];   // Match of value 1, content of first bracket
+    * } else {
+    *     if ( Net_LDAP2::isError($result) ) {
+    *         echo "Error: ".$result->getMessage();
+    *     } else {
+    *         echo "No match found.";
+    *     }
+    * }
+    * </code>
+    *
+    * Please note that it is important to test for an Net_LDAP2_Error, because objects are
+    * evaluating to true by default, thus if an error occured, and you only check using "==" then
+    * you get misleading results. Use the "identical" (===) operator to test for matches to
+    * avoid this as shown above.
+    *
+    * @param string $regex     The regular expression
+    * @param string $attr_name The attribute to search in
+    * @param array  $matches   (optional, PASS BY REFERENCE!) Array to store matches in
+    *
+    * @return boolean|Net_LDAP2_Error  TRUE, if we had a match in one of the values, otherwise false. Net_LDAP2_Error in case something went wrong
+    */
+    public function pregMatch($regex, $attr_name, $matches = array())
+    {
+        $matches = array();
+
+        // fetch attribute values
+        $attr = $this->getValue($attr_name, 'all');
+        if (Net_LDAP2::isError($attr)) {
+            return $attr;
+        } else {
+            unset($attr['count']);
+        }
+
+        // perform preg_match() on all values
+        $match = false;
+        foreach ($attr as $thisvalue) {
+            $matches_int = array();
+            if (preg_match($regex, $thisvalue, $matches_int)) {
+                $match = true;
+                array_push($matches, $matches_int); // store matches in reference
+            }
+        }
+        return $match;
+    }
+
+    /**
+    * Alias of {@link pregMatch()} for compatibility to Net_LDAP 1
+    *
+    * @see pregMatch()
+    * @return boolean|Net_LDAP2_Error
+    */
+    public function preg_match()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'pregMatch' ), $args);
+    }
+
+    /**
+    * Tells if the entry is consiedered as new (not present in the server)
+    *
+    * Please note, that this doesn't tell you if the entry is present on the server.
+    * Use {@link Net_LDAP2::dnExists()} to see if an entry is already there.
+    *
+    * @return boolean
+    */
+    public function isNew()
+    {
+        return $this->_new;
+    }
+
+
+    /**
+    * Is this entry going to be deleted once update() is called?
+    *
+    * @return boolean
+    */
+    public function willBeDeleted()
+    {
+        return $this->_delete;
+    }
+
+    /**
+    * Is this entry going to be moved once update() is called?
+    *
+    * @return boolean
+    */
+    public function willBeMoved()
+    {
+        return ($this->dn() !== $this->currentDN());
+    }
+
+    /**
+    * Returns always the original DN
+    *
+    * If an entry will be moved but {@link update()} was not called,
+    * {@link dn()} will return the new DN. This method however, returns
+    * always the current active DN.
+    *
+    * @return string
+    */
+    public function currentDN()
+    {
+        return $this->_dn;
+    }
+
+    /**
+    * Returns the attribute changes to be carried out once update() is called
+    *
+    * @return array
+    */
+    public function getChanges()
+    {
+        return $this->_changes;
+    }
+}
+?>
diff --git a/extlib/Net/LDAP2/Filter.php b/extlib/Net/LDAP2/Filter.php
new file mode 100644
index 000000000..0723edab2
--- /dev/null
+++ b/extlib/Net/LDAP2/Filter.php
@@ -0,0 +1,514 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Filter interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: Filter.php 289978 2009-10-27 09:56:41Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+require_once 'Util.php';
+
+/**
+* Object representation of a part of a LDAP filter.
+*
+* This Class is not completely compatible to the PERL interface!
+*
+* The purpose of this class is, that users can easily build LDAP filters
+* without having to worry about right escaping etc.
+* A Filter is built using several independent filter objects
+* which are combined afterwards. This object works in two
+* modes, depending how the object is created.
+* If the object is created using the {@link create()} method, then this is a leaf-object.
+* If the object is created using the {@link combine()} method, then this is a container object.
+*
+* LDAP filters are defined in RFC-2254 and can be found under
+* {@link http://www.ietf.org/rfc/rfc2254.txt}
+*
+* Here a quick copy&paste example:
+* <code>
+* $filter0 = Net_LDAP2_Filter::create('stars', 'equals', '***');
+* $filter_not0 = Net_LDAP2_Filter::combine('not', $filter0);
+*
+* $filter1 = Net_LDAP2_Filter::create('gn', 'begins', 'bar');
+* $filter2 = Net_LDAP2_Filter::create('gn', 'ends', 'baz');
+* $filter_comp = Net_LDAP2_Filter::combine('or',array($filter_not0, $filter1, $filter2));
+*
+* echo $filter_comp->asString();
+* // This will output: (|(!(stars=\0x5c0x2a\0x5c0x2a\0x5c0x2a))(gn=bar*)(gn=*baz))
+* // The stars in $filter0 are treaten as real stars unless you disable escaping.
+* </code>
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP2/
+*/
+class Net_LDAP2_Filter extends PEAR
+{
+    /**
+    * Storage for combination of filters
+    *
+    * This variable holds a array of filter objects
+    * that should be combined by this filter object.
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_subfilters = array();
+
+    /**
+    * Match of this filter
+    *
+    * If this is a leaf filter, then a matching rule is stored,
+    * if it is a container, then it is a logical operator
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_match;
+
+    /**
+    * Single filter
+    *
+    * If we operate in leaf filter mode,
+    * then the constructing method stores
+    * the filter representation here
+    *
+    * @acces private
+    * @var string
+    */
+    protected $_filter;
+
+    /**
+    * Create a new Net_LDAP2_Filter object and parse $filter.
+    *
+    * This is for PERL Net::LDAP interface.
+    * Construction of Net_LDAP2_Filter objects should happen through either
+    * {@link create()} or {@link combine()} which give you more control.
+    * However, you may use the perl iterface if you already have generated filters.
+    *
+    * @param string $filter LDAP filter string
+    *
+    * @see parse()
+    */
+    public function __construct($filter = false)
+    {
+        // The optional parameter must remain here, because otherwise create() crashes
+        if (false !== $filter) {
+            $filter_o = self::parse($filter);
+            if (PEAR::isError($filter_o)) {
+                $this->_filter = $filter_o; // assign error, so asString() can report it
+            } else {
+                $this->_filter = $filter_o->asString();
+            }
+        }
+    }
+
+    /**
+    * Constructor of a new part of a LDAP filter.
+    *
+    * The following matching rules exists:
+    *    - equals:         One of the attributes values is exactly $value
+    *                      Please note that case sensitiviness is depends on the
+    *                      attributes syntax configured in the server.
+    *    - begins:         One of the attributes values must begin with $value
+    *    - ends:           One of the attributes values must end with $value
+    *    - contains:       One of the attributes values must contain $value
+    *    - present | any:  The attribute can contain any value but must be existent
+    *    - greater:        The attributes value is greater than $value
+    *    - less:           The attributes value is less than $value
+    *    - greaterOrEqual: The attributes value is greater or equal than $value
+    *    - lessOrEqual:    The attributes value is less or equal than $value
+    *    - approx:         One of the attributes values is similar to $value
+    *
+    * If $escape is set to true (default) then $value will be escaped
+    * properly. If it is set to false then $value will be treaten as raw filter value string.
+    * You should escape yourself using {@link Net_LDAP2_Util::escape_filter_value()}!
+    *
+    * Examples:
+    * <code>
+    *   // This will find entries that contain an attribute "sn" that ends with "foobar":
+    *   $filter = new Net_LDAP2_Filter('sn', 'ends', 'foobar');
+    *
+    *   // This will find entries that contain an attribute "sn" that has any value set:
+    *   $filter = new Net_LDAP2_Filter('sn', 'any');
+    * </code>
+    *
+    * @param string  $attr_name Name of the attribute the filter should apply to
+    * @param string  $match     Matching rule (equals, begins, ends, contains, greater, less, greaterOrEqual, lessOrEqual, approx, any)
+    * @param string  $value     (optional) if given, then this is used as a filter
+    * @param boolean $escape    Should $value be escaped? (default: yes, see {@link Net_LDAP2_Util::escape_filter_value()} for detailed information)
+    *
+    * @return Net_LDAP2_Filter|Net_LDAP2_Error
+    */
+    public static function &create($attr_name, $match, $value = '', $escape = true)
+    {
+        $leaf_filter = new Net_LDAP2_Filter();
+        if ($escape) {
+            $array = Net_LDAP2_Util::escape_filter_value(array($value));
+            $value = $array[0];
+        }
+        switch (strtolower($match)) {
+        case 'equals':
+            $leaf_filter->_filter = '(' . $attr_name . '=' . $value . ')';
+            break;
+        case 'begins':
+            $leaf_filter->_filter = '(' . $attr_name . '=' . $value . '*)';
+            break;
+        case 'ends':
+            $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . ')';
+            break;
+        case 'contains':
+            $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . '*)';
+            break;
+        case 'greater':
+            $leaf_filter->_filter = '(' . $attr_name . '>' . $value . ')';
+            break;
+        case 'less':
+            $leaf_filter->_filter = '(' . $attr_name . '<' . $value . ')';
+            break;
+        case 'greaterorequal':
+        case '>=':
+            $leaf_filter->_filter = '(' . $attr_name . '>=' . $value . ')';
+            break;
+        case 'lessorequal':
+        case '<=':
+            $leaf_filter->_filter = '(' . $attr_name . '<=' . $value . ')';
+            break;
+        case 'approx':
+        case '~=':
+            $leaf_filter->_filter = '(' . $attr_name . '~=' . $value . ')';
+            break;
+        case 'any':
+        case 'present': // alias that may improve user code readability
+            $leaf_filter->_filter = '(' . $attr_name . '=*)';
+            break;
+        default:
+            return PEAR::raiseError('Net_LDAP2_Filter create error: matching rule "' . $match . '" not known!');
+        }
+        return $leaf_filter;
+    }
+
+    /**
+    * Combine two or more filter objects using a logical operator
+    *
+    * This static method combines two or more filter objects and returns one single
+    * filter object that contains all the others.
+    * Call this method statically: $filter = Net_LDAP2_Filter('or', array($filter1, $filter2))
+    * If the array contains filter strings instead of filter objects, we will try to parse them.
+    *
+    * @param string                 $log_op  The locicall operator. May be "and", "or", "not" or the subsequent logical equivalents "&", "|", "!"
+    * @param array|Net_LDAP2_Filter $filters array with Net_LDAP2_Filter objects
+    *
+    * @return Net_LDAP2_Filter|Net_LDAP2_Error
+    * @static
+    */
+    public static function &combine($log_op, $filters)
+    {
+        if (PEAR::isError($filters)) {
+            return $filters;
+        }
+
+        // substitude named operators to logical operators
+        if ($log_op == 'and') $log_op = '&';
+        if ($log_op == 'or')  $log_op = '|';
+        if ($log_op == 'not') $log_op = '!';
+
+        // tests for sane operation
+        if ($log_op == '!') {
+            // Not-combination, here we only accept one filter object or filter string
+            if ($filters instanceof Net_LDAP2_Filter) {
+                $filters = array($filters); // force array
+            } elseif (is_string($filters)) {
+                $filter_o = self::parse($filters);
+                if (PEAR::isError($filter_o)) {
+                    $err = PEAR::raiseError('Net_LDAP2_Filter combine error: '.$filter_o->getMessage());
+                    return $err;
+                } else {
+                    $filters = array($filter_o);
+                }
+            } elseif (is_array($filters)) {
+                $err = PEAR::raiseError('Net_LDAP2_Filter combine error: operator is "not" but $filter is an array!');
+                return $err;
+            } else {
+                $err = PEAR::raiseError('Net_LDAP2_Filter combine error: operator is "not" but $filter is not a valid Net_LDAP2_Filter nor a filter string!');
+                return $err;
+            }
+        } elseif ($log_op == '&' || $log_op == '|') {
+            if (!is_array($filters) || count($filters) < 2) {
+                $err = PEAR::raiseError('Net_LDAP2_Filter combine error: parameter $filters is not an array or contains less than two Net_LDAP2_Filter objects!');
+                return $err;
+            }
+        } else {
+            $err = PEAR::raiseError('Net_LDAP2_Filter combine error: logical operator is not known!');
+            return $err;
+        }
+
+        $combined_filter = new Net_LDAP2_Filter();
+        foreach ($filters as $key => $testfilter) {     // check for errors
+            if (PEAR::isError($testfilter)) {
+                return $testfilter;
+            } elseif (is_string($testfilter)) {
+                // string found, try to parse into an filter object
+                $filter_o = self::parse($testfilter);
+                if (PEAR::isError($filter_o)) {
+                    return $filter_o;
+                } else {
+                    $filters[$key] = $filter_o;
+                }
+            } elseif (!$testfilter instanceof Net_LDAP2_Filter) {
+                $err = PEAR::raiseError('Net_LDAP2_Filter combine error: invalid object passed in array $filters!');
+                return $err;
+            }
+        }
+
+        $combined_filter->_subfilters = $filters;
+        $combined_filter->_match      = $log_op;
+        return $combined_filter;
+    }
+
+    /**
+    * Parse FILTER into a Net_LDAP2_Filter object
+    *
+    * This parses an filter string into Net_LDAP2_Filter objects.
+    *
+    * @param string $FILTER The filter string
+    *
+    * @access static
+    * @return Net_LDAP2_Filter|Net_LDAP2_Error
+    * @todo Leaf-mode: Do we need to escape at all? what about *-chars?check for the need of encoding values, tackle problems (see code comments)
+    */
+    public static function parse($FILTER)
+    {
+        if (preg_match('/^\((.+?)\)$/', $FILTER, $matches)) {
+            if (in_array(substr($matches[1], 0, 1), array('!', '|', '&'))) {
+                // Subfilter processing: pass subfilters to parse() and combine
+                // the objects using the logical operator detected
+                // we have now something like "&(...)(...)(...)" but at least one part ("!(...)").
+                // Each subfilter could be an arbitary complex subfilter.
+
+                // extract logical operator and filter arguments
+                $log_op              = substr($matches[1], 0, 1);
+                $remaining_component = substr($matches[1], 1);
+
+                // split $remaining_component into individual subfilters
+                // we cannot use split() for this, because we do not know the
+                // complexiness of the subfilter. Thus, we look trough the filter
+                // string and just recognize ending filters at the first level.
+                // We record the index number of the char and use that information
+                // later to split the string.
+                $sub_index_pos = array();
+                $prev_char     = ''; // previous character looked at
+                $level         = 0;  // denotes the current bracket level we are,
+                                     //   >1 is too deep, 1 is ok, 0 is outside any
+                                     //   subcomponent
+                for ($curpos = 0; $curpos < strlen($remaining_component); $curpos++) {
+                    $cur_char = substr($remaining_component, $curpos, 1);
+
+                    // rise/lower bracket level
+                    if ($cur_char == '(' && $prev_char != '\\') {
+                        $level++;
+                    } elseif  ($cur_char == ')' && $prev_char != '\\') {
+                        $level--;
+                    }
+
+                    if ($cur_char == '(' && $prev_char == ')' && $level == 1) {
+                        array_push($sub_index_pos, $curpos); // mark the position for splitting
+                    }
+                    $prev_char = $cur_char;
+                }
+
+                // now perform the splits. To get also the last part, we
+                // need to add the "END" index to the split array
+                array_push($sub_index_pos, strlen($remaining_component));
+                $subfilters = array();
+                $oldpos = 0;
+                foreach ($sub_index_pos as $s_pos) {
+                    $str_part = substr($remaining_component, $oldpos, $s_pos - $oldpos);
+                    array_push($subfilters, $str_part);
+                    $oldpos = $s_pos;
+                }
+
+                // some error checking...
+                if (count($subfilters) == 1) {
+                    // only one subfilter found
+                } elseif (count($subfilters) > 1) {
+                    // several subfilters found
+                    if ($log_op == "!") {
+                        return PEAR::raiseError("Filter parsing error: invalid filter syntax - NOT operator detected but several arguments given!");
+                    }
+                } else {
+                    // this should not happen unless the user specified a wrong filter
+                    return PEAR::raiseError("Filter parsing error: invalid filter syntax - got operator '$log_op' but no argument!");
+                }
+
+                // Now parse the subfilters into objects and combine them using the operator
+                $subfilters_o = array();
+                foreach ($subfilters as $s_s) {
+                    $o = self::parse($s_s);
+                    if (PEAR::isError($o)) {
+                        return $o;
+                    } else {
+                        array_push($subfilters_o, self::parse($s_s));
+                    }
+                }
+
+                $filter_o = self::combine($log_op, $subfilters_o);
+                return $filter_o;
+
+            } else {
+                // This is one leaf filter component, do some syntax checks, then escape and build filter_o
+                // $matches[1] should be now something like "foo=bar"
+
+                // detect multiple leaf components
+                // [TODO] Maybe this will make problems with filters containing brackets inside the value
+                if (stristr($matches[1], ')(')) {
+                    return PEAR::raiseError("Filter parsing error: invalid filter syntax - multiple leaf components detected!");
+                } else {
+                    $filter_parts = preg_split('/(?<!\\\\)(=|=~|>|<|>=|<=)/', $matches[1], 2, PREG_SPLIT_DELIM_CAPTURE);
+                    if (count($filter_parts) != 3) {
+                        return PEAR::raiseError("Filter parsing error: invalid filter syntax - unknown matching rule used");
+                    } else {
+                        $filter_o          = new Net_LDAP2_Filter();
+                        // [TODO]: Do we need to escape at all? what about *-chars user provide and that should remain special?
+                        //         I think, those prevent escaping! We need to check against PERL Net::LDAP!
+                        // $value_arr         = Net_LDAP2_Util::escape_filter_value(array($filter_parts[2]));
+                        // $value             = $value_arr[0];
+                        $value             = $filter_parts[2];
+                        $filter_o->_filter = '('.$filter_parts[0].$filter_parts[1].$value.')';
+                        return $filter_o;
+                    }
+                }
+            }
+        } else {
+               // ERROR: Filter components must be enclosed in round brackets
+               return PEAR::raiseError("Filter parsing error: invalid filter syntax - filter components must be enclosed in round brackets");
+        }
+    }
+
+    /**
+    * Get the string representation of this filter
+    *
+    * This method runs through all filter objects and creates
+    * the string representation of the filter. If this
+    * filter object is a leaf filter, then it will return
+    * the string representation of this filter.
+    *
+    * @return string|Net_LDAP2_Error
+    */
+    public function asString()
+    {
+        if ($this->isLeaf()) {
+            $return = $this->_filter;
+        } else {
+            $return = '';
+            foreach ($this->_subfilters as $filter) {
+                $return = $return.$filter->asString();
+            }
+            $return = '(' . $this->_match . $return . ')';
+        }
+        return $return;
+    }
+
+    /**
+    * Alias for perl interface as_string()
+    *
+    * @see asString()
+    * @return string|Net_LDAP2_Error
+    */
+    public function as_string()
+    {
+        return $this->asString();
+    }
+
+    /**
+    * Print the text representation of the filter to FH, or the currently selected output handle if FH is not given
+    *
+    * This method is only for compatibility to the perl interface.
+    * However, the original method was called "print" but due to PHP language restrictions,
+    * we can't have a print() method.
+    *
+    * @param resource $FH (optional) A filehandle resource
+    *
+    * @return true|Net_LDAP2_Error
+    */
+    public function printMe($FH = false)
+    {
+        if (!is_resource($FH)) {
+            if (PEAR::isError($FH)) {
+                return $FH;
+            }
+            $filter_str = $this->asString();
+            if (PEAR::isError($filter_str)) {
+                return $filter_str;
+            } else {
+                print($filter_str);
+            }
+        } else {
+            $filter_str = $this->asString();
+            if (PEAR::isError($filter_str)) {
+                return $filter_str;
+            } else {
+                $res = @fwrite($FH, $this->asString());
+                if ($res == false) {
+                    return PEAR::raiseError("Unable to write filter string to filehandle \$FH!");
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+    * This can be used to escape a string to provide a valid LDAP-Filter.
+    *
+    * LDAP will only recognise certain characters as the
+    * character istself if they are properly escaped. This is
+    * what this method does.
+    * The method can be called statically, so you can use it outside
+    * for your own purposes (eg for escaping only parts of strings)
+    *
+    * In fact, this is just a shorthand to {@link Net_LDAP2_Util::escape_filter_value()}.
+    * For upward compatibiliy reasons you are strongly encouraged to use the escape
+    * methods provided by the Net_LDAP2_Util class.
+    *
+    * @param string $value Any string who should be escaped
+    *
+    * @static
+    * @return string         The string $string, but escaped
+    * @deprecated  Do not use this method anymore, instead use Net_LDAP2_Util::escape_filter_value() directly
+    */
+    public static function escape($value)
+    {
+        $return = Net_LDAP2_Util::escape_filter_value(array($value));
+        return $return[0];
+    }
+
+    /**
+    * Is this a container or a leaf filter object?
+    *
+    * @access protected
+    * @return boolean
+    */
+    protected function isLeaf()
+    {
+        if (count($this->_subfilters) > 0) {
+            return false; // Container!
+        } else {
+            return true; // Leaf!
+        }
+    }
+}
+?>
diff --git a/extlib/Net/LDAP2/LDIF.php b/extlib/Net/LDAP2/LDIF.php
new file mode 100644
index 000000000..34f3e75dd
--- /dev/null
+++ b/extlib/Net/LDAP2/LDIF.php
@@ -0,0 +1,922 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_LDIF interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: LDIF.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+require_once 'Net/LDAP2.php';
+require_once 'Net/LDAP2/Entry.php';
+require_once 'Net/LDAP2/Util.php';
+
+/**
+* LDIF capabilitys for Net_LDAP2, closely taken from PERLs Net::LDAP
+*
+* It provides a means to convert between Net_LDAP2_Entry objects and LDAP entries
+* represented in LDIF format files. Reading and writing are supported and may
+* manipulate single entries or lists of entries.
+*
+* Usage example:
+* <code>
+* // Read and parse an ldif-file into Net_LDAP2_Entry objects
+* // and print out the DNs. Store the entries for later use.
+* require 'Net/LDAP2/LDIF.php';
+* $options = array(
+*       'onerror' => 'die'
+* );
+* $entries = array();
+* $ldif = new Net_LDAP2_LDIF('test.ldif', 'r', $options);
+* do {
+*       $entry = $ldif->read_entry();
+*       $dn    = $entry->dn();
+*       echo " done building entry: $dn\n";
+*       array_push($entries, $entry);
+* } while (!$ldif->eof());
+* $ldif->done();
+*
+*
+* // write those entries to another file
+* $ldif = new Net_LDAP2_LDIF('test.out.ldif', 'w', $options);
+* $ldif->write_entry($entries);
+* $ldif->done();
+* </code>
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+* @see      http://www.ietf.org/rfc/rfc2849.txt
+* @todo     Error handling should be PEARified
+* @todo     LDAPv3 controls are not implemented yet
+*/
+class Net_LDAP2_LDIF extends PEAR
+{
+    /**
+    * Options
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_options = array('encode'    => 'base64',
+                                'onerror'   => null,
+                                'change'    => 0,
+                                'lowercase' => 0,
+                                'sort'      => 0,
+                                'version'   => null,
+                                'wrap'      => 78,
+                                'raw'       => ''
+                               );
+
+    /**
+    * Errorcache
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_error = array('error' => null,
+                              'line'  => 0
+                             );
+
+    /**
+    * Filehandle for read/write
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_FH = null;
+
+    /**
+    * Says, if we opened the filehandle ourselves
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_FH_opened = false;
+
+    /**
+    * Linecounter for input file handle
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_input_line = 0;
+
+    /**
+    * counter for processed entries
+    *
+    * @access protected
+    * @var int
+    */
+    protected $_entrynum = 0;
+
+    /**
+    * Mode we are working in
+    *
+    * Either 'r', 'a' or 'w'
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_mode = false;
+
+    /**
+    * Tells, if the LDIF version string was already written
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_version_written = false;
+
+    /**
+    * Cache for lines that have build the current entry
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_lines_cur = array();
+
+    /**
+    * Cache for lines that will build the next entry
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_lines_next = array();
+
+    /**
+    * Open LDIF file for reading or for writing
+    *
+    * new (FILE):
+    * Open the file read-only. FILE may be the name of a file
+    * or an already open filehandle.
+    * If the file doesn't exist, it will be created if in write mode.
+    *
+    * new (FILE, MODE, OPTIONS):
+    *     Open the file with the given MODE (see PHPs fopen()), eg "w" or "a".
+    *     FILE may be the name of a file or an already open filehandle.
+    *     PERLs Net_LDAP2 "FILE|" mode does not work curently.
+    *
+    *     OPTIONS is an associative array and may contain:
+    *       encode => 'none' | 'canonical' | 'base64'
+    *         Some DN values in LDIF cannot be written verbatim and have to be encoded in some way:
+    *         'none'       No encoding.
+    *         'canonical'  See "canonical_dn()" in Net::LDAP::Util.
+    *         'base64'     Use base64. (default, this differs from the Perl interface.
+    *                                   The perl default is "none"!)
+    *
+    *       onerror => 'die' | 'warn' | NULL
+    *         Specify what happens when an error is detected.
+    *         'die'  Net_LDAP2_LDIF will croak with an appropriate message.
+    *         'warn' Net_LDAP2_LDIF will warn (echo) with an appropriate message.
+    *         NULL   Net_LDAP2_LDIF will not warn (default), use error().
+    *
+    *       change => 1
+    *         Write entry changes to the LDIF file instead of the entries itself. I.e. write LDAP
+    *         operations acting on the entries to the file instead of the entries contents.
+    *         This writes the changes usually carried out by an update() to the LDIF file.
+    *
+    *       lowercase => 1
+    *         Convert attribute names to lowercase when writing.
+    *
+    *       sort => 1
+    *         Sort attribute names when writing entries according to the rule:
+    *         objectclass first then all other attributes alphabetically sorted by attribute name
+    *
+    *       version => '1'
+    *         Set the LDIF version to write to the resulting LDIF file.
+    *         According to RFC 2849 currently the only legal value for this option is 1.
+    *         When this option is set Net_LDAP2_LDIF tries to adhere more strictly to
+    *         the LDIF specification in RFC2489 in a few places.
+    *         The default is NULL meaning no version information is written to the LDIF file.
+    *
+    *       wrap => 78
+    *         Number of columns where output line wrapping shall occur.
+    *         Default is 78. Setting it to 40 or lower inhibits wrapping.
+    *
+    *       raw => REGEX
+    *         Use REGEX to denote the names of attributes that are to be
+    *         considered binary in search results if writing entries.
+    *         Example: raw => "/(?i:^jpegPhoto|;binary)/i"
+    *
+    * @param string|ressource $file    Filename or filehandle
+    * @param string           $mode    Mode to open filename
+    * @param array            $options Options like described above
+    */
+    public function __construct($file, $mode = 'r', $options = array())
+    {
+        $this->PEAR('Net_LDAP2_Error'); // default error class
+
+        // First, parse options
+        // todo: maybe implement further checks on possible values
+        foreach ($options as $option => $value) {
+            if (!array_key_exists($option, $this->_options)) {
+                $this->dropError('Net_LDAP2_LDIF error: option '.$option.' not known!');
+                return;
+            } else {
+                $this->_options[$option] = strtolower($value);
+            }
+        }
+
+        // setup LDIF class
+        $this->version($this->_options['version']);
+
+        // setup file mode
+        if (!preg_match('/^[rwa]\+?$/', $mode)) {
+            $this->dropError('Net_LDAP2_LDIF error: file mode '.$mode.' not supported!');
+        } else {
+            $this->_mode = $mode;
+
+            // setup filehandle
+            if (is_resource($file)) {
+                // TODO: checks on mode possible?
+                $this->_FH =& $file;
+            } else {
+                $imode = substr($this->_mode, 0, 1);
+                if ($imode == 'r') {
+                    if (!file_exists($file)) {
+                        $this->dropError('Unable to open '.$file.' for read: file not found');
+                        $this->_mode = false;
+                    }
+                    if (!is_readable($file)) {
+                        $this->dropError('Unable to open '.$file.' for read: permission denied');
+                        $this->_mode = false;
+                    }
+                }
+
+                if (($imode == 'w' || $imode == 'a')) {
+                    if (file_exists($file)) {
+                        if (!is_writable($file)) {
+                            $this->dropError('Unable to open '.$file.' for write: permission denied');
+                            $this->_mode = false;
+                        }
+                    } else {
+                        if (!@touch($file)) {
+                            $this->dropError('Unable to create '.$file.' for write: permission denied');
+                            $this->_mode = false;
+                        }
+                    }
+                }
+
+                if ($this->_mode) {
+                    $this->_FH = @fopen($file, $this->_mode);
+                    if (false === $this->_FH) {
+                        // Fallback; should never be reached if tests above are good enough!
+                        $this->dropError('Net_LDAP2_LDIF error: Could not open file '.$file);
+                    } else {
+                        $this->_FH_opened = true;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+    * Read one entry from the file and return it as a Net::LDAP::Entry object.
+    *
+    * @return Net_LDAP2_Entry
+    */
+    public function read_entry()
+    {
+        // read fresh lines, set them as current lines and create the entry
+        $attrs = $this->next_lines(true);
+        if (count($attrs) > 0) {
+            $this->_lines_cur = $attrs;
+        }
+        return $this->current_entry();
+    }
+
+    /**
+    * Returns true when the end of the file is reached.
+    *
+    * @return boolean
+    */
+    public function eof()
+    {
+        return feof($this->_FH);
+    }
+
+    /**
+    * Write the entry or entries to the LDIF file.
+    *
+    * If you want to build an LDIF file containing several entries AND
+    * you want to call write_entry() several times, you must open the filehandle
+    * in append mode ("a"), otherwise you will always get the last entry only.
+    *
+    * @param Net_LDAP2_Entry|array $entries Entry or array of entries
+    *
+    * @return void
+    * @todo implement operations on whole entries (adding a whole entry)
+    */
+    public function write_entry($entries)
+    {
+        if (!is_array($entries)) {
+            $entries = array($entries);
+        }
+
+        foreach ($entries as $entry) {
+            $this->_entrynum++;
+            if (!$entry instanceof Net_LDAP2_Entry) {
+                $this->dropError('Net_LDAP2_LDIF error: entry '.$this->_entrynum.' is not an Net_LDAP2_Entry object');
+            } else {
+                if ($this->_options['change']) {
+                    // LDIF change mode
+                    // fetch change information from entry
+                    $entry_attrs_changes = $entry->getChanges();
+                    $num_of_changes      = count($entry_attrs_changes['add'])
+                                           + count($entry_attrs_changes['replace'])
+                                           + count($entry_attrs_changes['delete']);
+
+                    $is_changed = ($num_of_changes > 0 || $entry->willBeDeleted() || $entry->willBeMoved());
+
+                    // write version if not done yet
+                    // also write DN of entry
+                    if ($is_changed) {
+                        if (!$this->_version_written) {
+                            $this->write_version();
+                        }
+                        $this->writeDN($entry->currentDN());
+                    }
+
+                    // process changes
+                    // TODO: consider DN add!
+                    if ($entry->willBeDeleted()) {
+                        $this->writeLine("changetype: delete".PHP_EOL);
+                    } elseif ($entry->willBeMoved()) {
+                        $this->writeLine("changetype: modrdn".PHP_EOL);
+                        $olddn     = Net_LDAP2_Util::ldap_explode_dn($entry->currentDN(), array('casefold' => 'none')); // maybe gives a bug if using multivalued RDNs
+                        $oldrdn    = array_shift($olddn);
+                        $oldparent = implode(',', $olddn);
+                        $newdn     = Net_LDAP2_Util::ldap_explode_dn($entry->dn(), array('casefold' => 'none')); // maybe gives a bug if using multivalued RDNs
+                        $rdn       = array_shift($newdn);
+                        $parent    = implode(',', $newdn);
+                        $this->writeLine("newrdn: ".$rdn.PHP_EOL);
+                        $this->writeLine("deleteoldrdn: 1".PHP_EOL);
+                        if ($parent !== $oldparent) {
+                            $this->writeLine("newsuperior: ".$parent.PHP_EOL);
+                        }
+                        // TODO: What if the entry has attribute changes as well?
+                        //       I think we should check for that and make a dummy
+                        //       entry with the changes that is written to the LDIF file
+                    } elseif ($num_of_changes > 0) {
+                        // write attribute change data
+                        $this->writeLine("changetype: modify".PHP_EOL);
+                        foreach ($entry_attrs_changes as $changetype => $entry_attrs) {
+                            foreach ($entry_attrs as $attr_name => $attr_values) {
+                                $this->writeLine("$changetype: $attr_name".PHP_EOL);
+                                if ($attr_values !== null) $this->writeAttribute($attr_name, $attr_values, $changetype);
+                                $this->writeLine("-".PHP_EOL);
+                            }
+                        }
+                    }
+
+                    // finish this entrys data if we had changes
+                    if ($is_changed) {
+                        $this->finishEntry();
+                    }
+                } else {
+                    // LDIF-content mode
+                    // fetch attributes for further processing
+                    $entry_attrs = $entry->getValues();
+
+                    // sort and put objectclass-attrs to first position
+                    if ($this->_options['sort']) {
+                        ksort($entry_attrs);
+                        if (array_key_exists('objectclass', $entry_attrs)) {
+                            $oc = $entry_attrs['objectclass'];
+                            unset($entry_attrs['objectclass']);
+                            $entry_attrs = array_merge(array('objectclass' => $oc), $entry_attrs);
+                        }
+                    }
+
+                    // write data
+                    if (!$this->_version_written) {
+                        $this->write_version();
+                    }
+                    $this->writeDN($entry->dn());
+                    foreach ($entry_attrs as $attr_name => $attr_values) {
+                        $this->writeAttribute($attr_name, $attr_values);
+                    }
+                    $this->finishEntry();
+                }
+            }
+        }
+    }
+
+    /**
+    * Write version to LDIF
+    *
+    * If the object's version is defined, this method allows to explicitely write the version before an entry is written.
+    * If not called explicitely, it gets called automatically when writing the first entry.
+    *
+    * @return void
+    */
+    public function write_version()
+    {
+        $this->_version_written = true;
+        if (!is_null($this->version())) {
+            return $this->writeLine('version: '.$this->version().PHP_EOL, 'Net_LDAP2_LDIF error: unable to write version');
+        }
+    }
+
+    /**
+    * Get or set LDIF version
+    *
+    * If called without arguments it returns the version of the LDIF file or NULL if no version has been set.
+    * If called with an argument it sets the LDIF version to VERSION.
+    * According to RFC 2849 currently the only legal value for VERSION is 1.
+    *
+    * @param int $version (optional) LDIF version to set
+    *
+    * @return int
+    */
+    public function version($version = null)
+    {
+        if ($version !== null) {
+            if ($version != 1) {
+                $this->dropError('Net_LDAP2_LDIF error: illegal LDIF version set');
+            } else {
+                $this->_options['version'] = $version;
+            }
+        }
+        return $this->_options['version'];
+    }
+
+    /**
+    * Returns the file handle the Net_LDAP2_LDIF object reads from or writes to.
+    *
+    * You can, for example, use this to fetch the content of the LDIF file yourself
+    *
+    * @return null|resource
+    */
+    public function &handle()
+    {
+        if (!is_resource($this->_FH)) {
+            $this->dropError('Net_LDAP2_LDIF error: invalid file resource');
+            $null = null;
+            return $null;
+        } else {
+            return $this->_FH;
+        }
+    }
+
+    /**
+    * Clean up
+    *
+    * This method signals that the LDIF object is no longer needed.
+    * You can use this to free up some memory and close the file handle.
+    * The file handle is only closed, if it was opened from Net_LDAP2_LDIF.
+    *
+    * @return void
+    */
+    public function done()
+    {
+        // close FH if we opened it
+        if ($this->_FH_opened) {
+            fclose($this->handle());
+        }
+
+        // free variables
+        foreach (get_object_vars($this) as $name => $value) {
+            unset($this->$name);
+        }
+    }
+
+    /**
+    * Returns last error message if error was found.
+    *
+    * Example:
+    * <code>
+    *  $ldif->someAction();
+    *  if ($ldif->error()) {
+    *     echo "Error: ".$ldif->error()." at input line: ".$ldif->error_lines();
+    *  }
+    * </code>
+    *
+    * @param boolean $as_string If set to true, only the message is returned
+    *
+    * @return false|Net_LDAP2_Error
+    */
+    public function error($as_string = false)
+    {
+        if (Net_LDAP2::isError($this->_error['error'])) {
+            return ($as_string)? $this->_error['error']->getMessage() : $this->_error['error'];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+    * Returns lines that resulted in error.
+    *
+    * Perl returns an array of faulty lines in list context,
+    * but we always just return an int because of PHPs language.
+    *
+    * @return int
+    */
+    public function error_lines()
+    {
+        return $this->_error['line'];
+    }
+
+    /**
+    * Returns the current Net::LDAP::Entry object.
+    *
+    * @return Net_LDAP2_Entry|false
+    */
+    public function current_entry()
+    {
+        return $this->parseLines($this->current_lines());
+    }
+
+    /**
+    * Parse LDIF lines of one entry into an Net_LDAP2_Entry object
+    *
+    * @param array $lines LDIF lines for one entry
+    *
+    * @return Net_LDAP2_Entry|false Net_LDAP2_Entry object for those lines
+    * @todo what about file inclusions and urls? "jpegphoto:< file:///usr/local/directory/photos/fiona.jpg"
+    */
+    public function parseLines($lines)
+    {
+        // parse lines into an array of attributes and build the entry
+        $attributes = array();
+        $dn = false;
+        foreach ($lines as $line) {
+            if (preg_match('/^(\w+)(:|::|:<)\s(.+)$/', $line, $matches)) {
+                $attr  =& $matches[1];
+                $delim =& $matches[2];
+                $data  =& $matches[3];
+
+                if ($delim == ':') {
+                    // normal data
+                    $attributes[$attr][] = $data;
+                } elseif ($delim == '::') {
+                    // base64 data
+                    $attributes[$attr][] = base64_decode($data);
+                } elseif ($delim == ':<') {
+                    // file inclusion
+                    // TODO: Is this the job of the LDAP-client or the server?
+                    $this->dropError('File inclusions are currently not supported');
+                    //$attributes[$attr][] = ...;
+                } else {
+                    // since the pattern above, the delimeter cannot be something else.
+                    $this->dropError('Net_LDAP2_LDIF parsing error: invalid syntax at parsing entry line: '.$line);
+                    continue;
+                }
+
+                if (strtolower($attr) == 'dn') {
+                    // DN line detected
+                    $dn = $attributes[$attr][0];  // save possibly decoded DN
+                    unset($attributes[$attr]);    // remove wrongly added "dn: " attribute
+                }
+            } else {
+                // line not in "attr: value" format -> ignore
+                // maybe we should rise an error here, but this should be covered by
+                // next_lines() already. A problem arises, if users try to feed data of
+                // several entries to this method - the resulting entry will
+                // get wrong attributes. However, this is already mentioned in the
+                // methods documentation above.
+            }
+        }
+
+        if (false === $dn) {
+            $this->dropError('Net_LDAP2_LDIF parsing error: unable to detect DN for entry');
+            return false;
+        } else {
+            $newentry = Net_LDAP2_Entry::createFresh($dn, $attributes);
+            return $newentry;
+        }
+    }
+
+    /**
+    * Returns the lines that generated the current Net::LDAP::Entry object.
+    *
+    * Note that this returns an empty array if no lines have been read so far.
+    *
+    * @return array Array of lines
+    */
+    public function current_lines()
+    {
+        return $this->_lines_cur;
+    }
+
+    /**
+    * Returns the lines that will generate the next Net::LDAP::Entry object.
+    *
+    * If you set $force to TRUE then you can iterate over the lines that build
+    * up entries manually. Otherwise, iterating is done using {@link read_entry()}.
+    * Force will move the file pointer forward, thus returning the next entries lines.
+    *
+    * Wrapped lines will be unwrapped. Comments are stripped.
+    *
+    * @param boolean $force Set this to true if you want to iterate over the lines manually
+    *
+    * @return array
+    */
+    public function next_lines($force = false)
+    {
+        // if we already have those lines, just return them, otherwise read
+        if (count($this->_lines_next) == 0 || $force) {
+            $this->_lines_next = array(); // empty in case something was left (if used $force)
+            $entry_done        = false;
+            $fh                = &$this->handle();
+            $commentmode       = false; // if we are in an comment, for wrapping purposes
+            $datalines_read    = 0;     // how many lines with data we have read
+
+            while (!$entry_done && !$this->eof()) {
+                $this->_input_line++;
+                // Read line. Remove line endings, we want only data;
+                // this is okay since ending spaces should be encoded
+                $data = rtrim(fgets($fh));
+                if ($data === false) {
+                    // error only, if EOF not reached after fgets() call
+                    if (!$this->eof()) {
+                        $this->dropError('Net_LDAP2_LDIF error: error reading from file at input line '.$this->_input_line, $this->_input_line);
+                    }
+                    break;
+                } else {
+                    if (count($this->_lines_next) > 0 && preg_match('/^$/', $data)) {
+                        // Entry is finished if we have an empty line after we had data
+                        $entry_done = true;
+
+                        // Look ahead if the next EOF is nearby. Comments and empty
+                        // lines at the file end may cause problems otherwise
+                        $current_pos = ftell($fh);
+                        $data        = fgets($fh);
+                        while (!feof($fh)) {
+                            if (preg_match('/^\s*$/', $data) || preg_match('/^#/', $data)) {
+                                // only empty lines or comments, continue to seek
+                                // TODO: Known bug: Wrappings for comments are okay but are treaten as
+                                //       error, since we do not honor comment mode here.
+                                //       This should be a very theoretically case, however
+                                //       i am willing to fix this if really necessary.
+                                $this->_input_line++;
+                                $current_pos = ftell($fh);
+                                $data        = fgets($fh);
+                            } else {
+                                // Data found if non emtpy line and not a comment!!
+                                // Rewind to position prior last read and stop lookahead
+                                fseek($fh, $current_pos);
+                                break;
+                            }
+                        }
+                        // now we have either the file pointer at the beginning of
+                        // a new data position or at the end of file causing feof() to return true
+
+                    } else {
+                        // build lines
+                        if (preg_match('/^version:\s(.+)$/', $data, $match)) {
+                            // version statement, set version
+                            $this->version($match[1]);
+                        } elseif (preg_match('/^\w+::?\s.+$/', $data)) {
+                            // normal attribute: add line
+                            $commentmode         = false;
+                            $this->_lines_next[] = trim($data);
+                            $datalines_read++;
+                        } elseif (preg_match('/^\s(.+)$/', $data, $matches)) {
+                            // wrapped data: unwrap if not in comment mode
+                            if (!$commentmode) {
+                                if ($datalines_read == 0) {
+                                    // first line of entry: wrapped data is illegal
+                                    $this->dropError('Net_LDAP2_LDIF error: illegal wrapping at input line '.$this->_input_line, $this->_input_line);
+                                } else {
+                                    $last                = array_pop($this->_lines_next);
+                                    $last                = $last.trim($matches[1]);
+                                    $this->_lines_next[] = $last;
+                                    $datalines_read++;
+                                }
+                            }
+                        } elseif (preg_match('/^#/', $data)) {
+                            // LDIF comments
+                            $commentmode = true;
+                        } elseif (preg_match('/^\s*$/', $data)) {
+                            // empty line but we had no data for this
+                            // entry, so just ignore this line
+                            $commentmode = false;
+                        } else {
+                            $this->dropError('Net_LDAP2_LDIF error: invalid syntax at input line '.$this->_input_line, $this->_input_line);
+                            continue;
+                        }
+
+                    }
+                }
+            }
+        }
+        return $this->_lines_next;
+    }
+
+    /**
+    * Convert an attribute and value to LDIF string representation
+    *
+    * It honors correct encoding of values according to RFC 2849.
+    * Line wrapping will occur at the configured maximum but only if
+    * the value is greater than 40 chars.
+    *
+    * @param string $attr_name  Name of the attribute
+    * @param string $attr_value Value of the attribute
+    *
+    * @access protected
+    * @return string LDIF string for that attribute and value
+    */
+    protected function convertAttribute($attr_name, $attr_value)
+    {
+        // Handle empty attribute or process
+        if (strlen($attr_value) == 0) {
+            $attr_value = " ";
+        } else {
+            $base64 = false;
+            // ASCII-chars that are NOT safe for the
+            // start and for being inside the value.
+            // These are the int values of those chars.
+            $unsafe_init = array(0, 10, 13, 32, 58, 60);
+            $unsafe      = array(0, 10, 13);
+
+            // Test for illegal init char
+            $init_ord = ord(substr($attr_value, 0, 1));
+            if ($init_ord > 127 || in_array($init_ord, $unsafe_init)) {
+                $base64 = true;
+            }
+
+            // Test for illegal content char
+            for ($i = 0; $i < strlen($attr_value); $i++) {
+                $char_ord = ord(substr($attr_value, $i, 1));
+                if ($char_ord > 127 || in_array($char_ord, $unsafe)) {
+                    $base64 = true;
+                }
+            }
+
+            // Test for ending space
+            if (substr($attr_value, -1) == ' ') {
+                $base64 = true;
+            }
+
+            // If converting is needed, do it
+            // Either we have some special chars or a matching "raw" regex
+            if ($base64 || ($this->_options['raw'] && preg_match($this->_options['raw'], $attr_name))) {
+                $attr_name .= ':';
+                $attr_value = base64_encode($attr_value);
+            }
+
+            // Lowercase attr names if requested
+            if ($this->_options['lowercase']) $attr_name = strtolower($attr_name);
+
+            // Handle line wrapping
+            if ($this->_options['wrap'] > 40 && strlen($attr_value) > $this->_options['wrap']) {
+                $attr_value = wordwrap($attr_value, $this->_options['wrap'], PHP_EOL." ", true);
+            }
+        }
+
+        return $attr_name.': '.$attr_value;
+    }
+
+    /**
+    * Convert an entries DN to LDIF string representation
+    *
+    * It honors correct encoding of values according to RFC 2849.
+    *
+    * @param string $dn UTF8-Encoded DN
+    *
+    * @access protected
+    * @return string LDIF string for that DN
+    * @todo I am not sure, if the UTF8 stuff is correctly handled right now
+    */
+    protected function convertDN($dn)
+    {
+        $base64 = false;
+        // ASCII-chars that are NOT safe for the
+        // start and for being inside the dn.
+        // These are the int values of those chars.
+        $unsafe_init = array(0, 10, 13, 32, 58, 60);
+        $unsafe      = array(0, 10, 13);
+
+        // Test for illegal init char
+        $init_ord = ord(substr($dn, 0, 1));
+        if ($init_ord >= 127 || in_array($init_ord, $unsafe_init)) {
+            $base64 = true;
+        }
+
+        // Test for illegal content char
+        for ($i = 0; $i < strlen($dn); $i++) {
+            $char = substr($dn, $i, 1);
+            if (ord($char) >= 127 || in_array($init_ord, $unsafe)) {
+                $base64 = true;
+            }
+        }
+
+        // Test for ending space
+        if (substr($dn, -1) == ' ') {
+            $base64 = true;
+        }
+
+        // if converting is needed, do it
+        return ($base64)? 'dn:: '.base64_encode($dn) : 'dn: '.$dn;
+    }
+
+    /**
+    * Writes an attribute to the filehandle
+    *
+    * @param string       $attr_name   Name of the attribute
+    * @param string|array $attr_values Single attribute value or array with attribute values
+    *
+    * @access protected
+    * @return void
+    */
+    protected function writeAttribute($attr_name, $attr_values)
+    {
+        // write out attribute content
+        if (!is_array($attr_values)) {
+            $attr_values = array($attr_values);
+        }
+        foreach ($attr_values as $attr_val) {
+            $line = $this->convertAttribute($attr_name, $attr_val).PHP_EOL;
+            $this->writeLine($line, 'Net_LDAP2_LDIF error: unable to write attribute '.$attr_name.' of entry '.$this->_entrynum);
+        }
+    }
+
+    /**
+    * Writes a DN to the filehandle
+    *
+    * @param string $dn DN to write
+    *
+    * @access protected
+    * @return void
+    */
+    protected function writeDN($dn)
+    {
+        // prepare DN
+        if ($this->_options['encode'] == 'base64') {
+            $dn = $this->convertDN($dn).PHP_EOL;
+        } elseif ($this->_options['encode'] == 'canonical') {
+            $dn = Net_LDAP2_Util::canonical_dn($dn, array('casefold' => 'none')).PHP_EOL;
+        } else {
+            $dn = $dn.PHP_EOL;
+        }
+        $this->writeLine($dn, 'Net_LDAP2_LDIF error: unable to write DN of entry '.$this->_entrynum);
+    }
+
+    /**
+    * Finishes an LDIF entry
+    *
+    * @access protected
+    * @return void
+    */
+    protected function finishEntry()
+    {
+        $this->writeLine(PHP_EOL, 'Net_LDAP2_LDIF error: unable to close entry '.$this->_entrynum);
+    }
+
+    /**
+    * Just write an arbitary line to the filehandle
+    *
+    * @param string $line  Content to write
+    * @param string $error If error occurs, drop this message
+    *
+    * @access protected
+    * @return true|false
+    */
+    protected function writeLine($line, $error = 'Net_LDAP2_LDIF error: unable to write to filehandle')
+    {
+        if (is_resource($this->handle()) && fwrite($this->handle(), $line, strlen($line)) === false) {
+            $this->dropError($error);
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+    * Optionally raises an error and pushes the error on the error cache
+    *
+    * @param string $msg  Errortext
+    * @param int    $line Line in the LDIF that caused the error
+    *
+    * @access protected
+    * @return void
+    */
+    protected function dropError($msg, $line = null)
+    {
+        $this->_error['error'] = new Net_LDAP2_Error($msg);
+        if ($line !== null) $this->_error['line'] = $line;
+
+        if ($this->_options['onerror'] == 'die') {
+            die($msg.PHP_EOL);
+        } elseif ($this->_options['onerror'] == 'warn') {
+            echo $msg.PHP_EOL;
+        }
+    }
+}
+?>
diff --git a/extlib/Net/LDAP2/RootDSE.php b/extlib/Net/LDAP2/RootDSE.php
new file mode 100644
index 000000000..8dc81fd4f
--- /dev/null
+++ b/extlib/Net/LDAP2/RootDSE.php
@@ -0,0 +1,240 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_RootDSE interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Jan Wagner <wagner@netsols.de>
+* @copyright 2009 Jan Wagner
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: RootDSE.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Getting the rootDSE entry of a LDAP server
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Jan Wagner <wagner@netsols.de>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_RootDSE extends PEAR
+{
+    /**
+    * @access protected
+    * @var object Net_LDAP2_Entry
+    **/
+    protected $_entry;
+
+    /**
+    * Class constructor
+    *
+    * @param Net_LDAP2_Entry &$entry Net_LDAP2_Entry object of the RootDSE
+    */
+    protected function __construct(&$entry)
+    {
+        $this->_entry = $entry;
+    }
+
+    /**
+    * Fetches a RootDSE object from an LDAP connection
+    *
+    * @param Net_LDAP2 $ldap  Directory from which the RootDSE should be fetched
+    * @param array     $attrs Array of attributes to search for
+    *
+    * @access static
+    * @return Net_LDAP2_RootDSE|Net_LDAP2_Error
+    */
+    public static function fetch($ldap, $attrs = null)
+    {
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!");
+        }
+
+        if (is_array($attrs) && count($attrs) > 0 ) {
+            $attributes = $attrs;
+        } else {
+            $attributes = array('vendorName',
+                                'vendorVersion',
+                                'namingContexts',
+                                'altServer',
+                                'supportedExtension',
+                                'supportedControl',
+                                'supportedSASLMechanisms',
+                                'supportedLDAPVersion',
+                                'subschemaSubentry' );
+        }
+        $result = $ldap->search('', '(objectClass=*)', array('attributes' => $attributes, 'scope' => 'base'));
+        if (self::isError($result)) {
+            return $result;
+        }
+        $entry = $result->shiftEntry();
+        if (false === $entry) {
+            return PEAR::raiseError('Could not fetch RootDSE entry');
+        }
+        $ret = new Net_LDAP2_RootDSE($entry);
+        return $ret;
+    }
+
+    /**
+    * Gets the requested attribute value
+    *
+    * Same usuage as {@link Net_LDAP2_Entry::getValue()}
+    *
+    * @param string $attr    Attribute name
+    * @param array  $options Array of options
+    *
+    * @access public
+    * @return mixed Net_LDAP2_Error object or attribute values
+    * @see Net_LDAP2_Entry::get_value()
+    */
+    public function getValue($attr = '', $options = '')
+    {
+        return $this->_entry->get_value($attr, $options);
+    }
+
+    /**
+    * Alias function of getValue() for perl-ldap interface
+    *
+    * @see getValue()
+    * @return mixed
+    */
+    public function get_value()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'getValue' ), $args);
+    }
+
+    /**
+    * Determines if the extension is supported
+    *
+    * @param array $oids Array of oids to check
+    *
+    * @access public
+    * @return boolean
+    */
+    public function supportedExtension($oids)
+    {
+        return $this->checkAttr($oids, 'supportedExtension');
+    }
+
+    /**
+    * Alias function of supportedExtension() for perl-ldap interface
+    *
+    * @see supportedExtension()
+    * @return boolean
+    */
+    public function supported_extension()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'supportedExtension'), $args);
+    }
+
+    /**
+    * Determines if the version is supported
+    *
+    * @param array $versions Versions to check
+    *
+    * @access public
+    * @return boolean
+    */
+    public function supportedVersion($versions)
+    {
+        return $this->checkAttr($versions, 'supportedLDAPVersion');
+    }
+
+    /**
+    * Alias function of supportedVersion() for perl-ldap interface
+    *
+    * @see supportedVersion()
+    * @return boolean
+    */
+    public function supported_version()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, 'supportedVersion'), $args);
+    }
+
+    /**
+    * Determines if the control is supported
+    *
+    * @param array $oids Control oids to check
+    *
+    * @access public
+    * @return boolean
+    */
+    public function supportedControl($oids)
+    {
+        return $this->checkAttr($oids, 'supportedControl');
+    }
+
+    /**
+    * Alias function of supportedControl() for perl-ldap interface
+    *
+    * @see supportedControl()
+    * @return boolean
+    */
+    public function supported_control()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, 'supportedControl' ), $args);
+    }
+
+    /**
+    * Determines if the sasl mechanism is supported
+    *
+    * @param array $mechlist SASL mechanisms to check
+    *
+    * @access public
+    * @return boolean
+    */
+    public function supportedSASLMechanism($mechlist)
+    {
+        return $this->checkAttr($mechlist, 'supportedSASLMechanisms');
+    }
+
+    /**
+    * Alias function of supportedSASLMechanism() for perl-ldap interface
+    *
+    * @see supportedSASLMechanism()
+    * @return boolean
+    */
+    public function supported_sasl_mechanism()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, 'supportedSASLMechanism'), $args);
+    }
+
+    /**
+    * Checks for existance of value in attribute
+    *
+    * @param array  $values values to check
+    * @param string $attr   attribute name
+    *
+    * @access protected
+    * @return boolean
+    */
+    protected function checkAttr($values, $attr)
+    {
+        if (!is_array($values)) $values = array($values);
+
+        foreach ($values as $value) {
+            if (!@in_array($value, $this->get_value($attr, 'all'))) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+
+?>
diff --git a/extlib/Net/LDAP2/Schema.php b/extlib/Net/LDAP2/Schema.php
new file mode 100644
index 000000000..b590eabc5
--- /dev/null
+++ b/extlib/Net/LDAP2/Schema.php
@@ -0,0 +1,516 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Schema interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Jan Wagner, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: Schema.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+* @todo see the comment at the end of the file
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Syntax definitions
+*
+* Please don't forget to add binary attributes to isBinary() below
+* to support proper value fetching from Net_LDAP2_Entry
+*/
+define('NET_LDAP2_SYNTAX_BOOLEAN',            '1.3.6.1.4.1.1466.115.121.1.7');
+define('NET_LDAP2_SYNTAX_DIRECTORY_STRING',   '1.3.6.1.4.1.1466.115.121.1.15');
+define('NET_LDAP2_SYNTAX_DISTINGUISHED_NAME', '1.3.6.1.4.1.1466.115.121.1.12');
+define('NET_LDAP2_SYNTAX_INTEGER',            '1.3.6.1.4.1.1466.115.121.1.27');
+define('NET_LDAP2_SYNTAX_JPEG',               '1.3.6.1.4.1.1466.115.121.1.28');
+define('NET_LDAP2_SYNTAX_NUMERIC_STRING',     '1.3.6.1.4.1.1466.115.121.1.36');
+define('NET_LDAP2_SYNTAX_OID',                '1.3.6.1.4.1.1466.115.121.1.38');
+define('NET_LDAP2_SYNTAX_OCTET_STRING',       '1.3.6.1.4.1.1466.115.121.1.40');
+
+/**
+* Load an LDAP Schema and provide information
+*
+* This class takes a Subschema entry, parses this information
+* and makes it available in an array. Most of the code has been
+* inspired by perl-ldap( http://perl-ldap.sourceforge.net).
+* You will find portions of their implementation in here.
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Jan Wagner <wagner@netsols.de>
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_Schema extends PEAR
+{
+    /**
+    * Map of entry types to ldap attributes of subschema entry
+    *
+    * @access public
+    * @var array
+    */
+    public $types = array(
+            'attribute'        => 'attributeTypes',
+            'ditcontentrule'   => 'dITContentRules',
+            'ditstructurerule' => 'dITStructureRules',
+            'matchingrule'     => 'matchingRules',
+            'matchingruleuse'  => 'matchingRuleUse',
+            'nameform'         => 'nameForms',
+            'objectclass'      => 'objectClasses',
+            'syntax'           => 'ldapSyntaxes'
+        );
+
+    /**
+    * Array of entries belonging to this type
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_attributeTypes    = array();
+    protected $_matchingRules     = array();
+    protected $_matchingRuleUse   = array();
+    protected $_ldapSyntaxes      = array();
+    protected $_objectClasses     = array();
+    protected $_dITContentRules   = array();
+    protected $_dITStructureRules = array();
+    protected $_nameForms         = array();
+
+
+    /**
+    * hash of all fetched oids
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_oids = array();
+
+    /**
+    * Tells if the schema is initialized
+    *
+    * @access protected
+    * @var boolean
+    * @see parse(), get()
+    */
+    protected $_initialized = false;
+
+
+    /**
+    * Constructor of the class
+    *
+    * @access protected
+    */
+    protected function __construct()
+    {
+        $this->PEAR('Net_LDAP2_Error'); // default error class
+    }
+
+    /**
+    * Fetch the Schema from an LDAP connection
+    *
+    * @param Net_LDAP2 $ldap LDAP connection
+    * @param string    $dn   (optional) Subschema entry dn
+    *
+    * @access public
+    * @return Net_LDAP2_Schema|NET_LDAP2_Error
+    */
+    public function fetch($ldap, $dn = null)
+    {
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!");
+        }
+
+        $schema_o = new Net_LDAP2_Schema();
+
+        if (is_null($dn)) {
+            // get the subschema entry via root dse
+            $dse = $ldap->rootDSE(array('subschemaSubentry'));
+            if (false == Net_LDAP2::isError($dse)) {
+                $base = $dse->getValue('subschemaSubentry', 'single');
+                if (!Net_LDAP2::isError($base)) {
+                    $dn = $base;
+                }
+            }
+        }
+
+        // Support for buggy LDAP servers (e.g. Siemens DirX 6.x) that incorrectly
+        // call this entry subSchemaSubentry instead of subschemaSubentry.
+        // Note the correct case/spelling as per RFC 2251.
+        if (is_null($dn)) {
+            // get the subschema entry via root dse
+            $dse = $ldap->rootDSE(array('subSchemaSubentry'));
+            if (false == Net_LDAP2::isError($dse)) {
+                $base = $dse->getValue('subSchemaSubentry', 'single');
+                if (!Net_LDAP2::isError($base)) {
+                    $dn = $base;
+                }
+            }
+        }
+
+        // Final fallback case where there is no subschemaSubentry attribute
+        // in the root DSE (this is a bug for an LDAP v3 server so report this
+        // to your LDAP vendor if you get this far).
+        if (is_null($dn)) {
+            $dn = 'cn=Subschema';
+        }
+
+        // fetch the subschema entry
+        $result = $ldap->search($dn, '(objectClass=*)',
+                                array('attributes' => array_values($schema_o->types),
+                                        'scope' => 'base'));
+        if (Net_LDAP2::isError($result)) {
+            return $result;
+        }
+
+        $entry = $result->shiftEntry();
+        if (!$entry instanceof Net_LDAP2_Entry) {
+            return PEAR::raiseError('Could not fetch Subschema entry');
+        }
+
+        $schema_o->parse($entry);
+        return $schema_o;
+    }
+
+    /**
+    * Return a hash of entries for the given type
+    *
+    * Returns a hash of entry for th givene type. Types may be:
+    * objectclasses, attributes, ditcontentrules, ditstructurerules, matchingrules,
+    * matchingruleuses, nameforms, syntaxes
+    *
+    * @param string $type Type to fetch
+    *
+    * @access public
+    * @return array|Net_LDAP2_Error Array or Net_LDAP2_Error
+    */
+    public function &getAll($type)
+    {
+        $map = array('objectclasses'     => &$this->_objectClasses,
+                     'attributes'        => &$this->_attributeTypes,
+                     'ditcontentrules'   => &$this->_dITContentRules,
+                     'ditstructurerules' => &$this->_dITStructureRules,
+                     'matchingrules'     => &$this->_matchingRules,
+                     'matchingruleuses'  => &$this->_matchingRuleUse,
+                     'nameforms'         => &$this->_nameForms,
+                     'syntaxes'          => &$this->_ldapSyntaxes );
+
+        $key = strtolower($type);
+        $ret = ((key_exists($key, $map)) ? $map[$key] : PEAR::raiseError("Unknown type $type"));
+        return $ret;
+    }
+
+    /**
+    * Return a specific entry
+    *
+    * @param string $type Type of name
+    * @param string $name Name or OID to fetch
+    *
+    * @access public
+    * @return mixed Entry or Net_LDAP2_Error
+    */
+    public function &get($type, $name)
+    {
+        if ($this->_initialized) {
+            $type = strtolower($type);
+            if (false == key_exists($type, $this->types)) {
+                return PEAR::raiseError("No such type $type");
+            }
+
+            $name     = strtolower($name);
+            $type_var = &$this->{'_' . $this->types[$type]};
+
+            if (key_exists($name, $type_var)) {
+                return $type_var[$name];
+            } elseif (key_exists($name, $this->_oids) && $this->_oids[$name]['type'] == $type) {
+                return $this->_oids[$name];
+            } else {
+                return PEAR::raiseError("Could not find $type $name");
+            }
+        } else {
+            $return = null;
+            return $return;
+        }
+    }
+
+
+    /**
+    * Fetches attributes that MAY be present in the given objectclass
+    *
+    * @param string $oc Name or OID of objectclass
+    *
+    * @access public
+    * @return array|Net_LDAP2_Error Array with attributes or Net_LDAP2_Error
+    */
+    public function may($oc)
+    {
+        return $this->_getAttr($oc, 'may');
+    }
+
+    /**
+    * Fetches attributes that MUST be present in the given objectclass
+    *
+    * @param string $oc Name or OID of objectclass
+    *
+    * @access public
+    * @return array|Net_LDAP2_Error Array with attributes or Net_LDAP2_Error
+    */
+    public function must($oc)
+    {
+        return $this->_getAttr($oc, 'must');
+    }
+
+    /**
+    * Fetches the given attribute from the given objectclass
+    *
+    * @param string $oc   Name or OID of objectclass
+    * @param string $attr Name of attribute to fetch
+    *
+    * @access protected
+    * @return array|Net_LDAP2_Error The attribute or Net_LDAP2_Error
+    */
+    protected function _getAttr($oc, $attr)
+    {
+        $oc = strtolower($oc);
+        if (key_exists($oc, $this->_objectClasses) && key_exists($attr, $this->_objectClasses[$oc])) {
+            return $this->_objectClasses[$oc][$attr];
+        } elseif (key_exists($oc, $this->_oids) &&
+                $this->_oids[$oc]['type'] == 'objectclass' &&
+                key_exists($attr, $this->_oids[$oc])) {
+            return $this->_oids[$oc][$attr];
+        } else {
+            return PEAR::raiseError("Could not find $attr attributes for $oc ");
+        }
+    }
+
+    /**
+    * Returns the name(s) of the immediate superclass(es)
+    *
+    * @param string $oc Name or OID of objectclass
+    *
+    * @access public
+    * @return array|Net_LDAP2_Error  Array of names or Net_LDAP2_Error
+    */
+    public function superclass($oc)
+    {
+        $o = $this->get('objectclass', $oc);
+        if (Net_LDAP2::isError($o)) {
+            return $o;
+        }
+        return (key_exists('sup', $o) ? $o['sup'] : array());
+    }
+
+    /**
+    * Parses the schema of the given Subschema entry
+    *
+    * @param Net_LDAP2_Entry &$entry Subschema entry
+    *
+    * @access public
+    * @return void
+    */
+    public function parse(&$entry)
+    {
+        foreach ($this->types as $type => $attr) {
+            // initialize map type to entry
+            $type_var          = '_' . $attr;
+            $this->{$type_var} = array();
+
+            // get values for this type
+            if ($entry->exists($attr)) {
+                $values = $entry->getValue($attr);
+                if (is_array($values)) {
+                    foreach ($values as $value) {
+
+                        unset($schema_entry); // this was a real mess without it
+
+                        // get the schema entry
+                        $schema_entry = $this->_parse_entry($value);
+
+                        // set the type
+                        $schema_entry['type'] = $type;
+
+                        // save a ref in $_oids
+                        $this->_oids[$schema_entry['oid']] = &$schema_entry;
+
+                        // save refs for all names in type map
+                        $names = $schema_entry['aliases'];
+                        array_push($names, $schema_entry['name']);
+                        foreach ($names as $name) {
+                            $this->{$type_var}[strtolower($name)] = &$schema_entry;
+                        }
+                    }
+                }
+            }
+        }
+        $this->_initialized = true;
+    }
+
+    /**
+    * Parses an attribute value into a schema entry
+    *
+    * @param string $value Attribute value
+    *
+    * @access protected
+    * @return array|false Schema entry array or false
+    */
+    protected function &_parse_entry($value)
+    {
+        // tokens that have no value associated
+        $noValue = array('single-value',
+                         'obsolete',
+                         'collective',
+                         'no-user-modification',
+                         'abstract',
+                         'structural',
+                         'auxiliary');
+
+        // tokens that can have multiple values
+        $multiValue = array('must', 'may', 'sup');
+
+        $schema_entry = array('aliases' => array()); // initilization
+
+        $tokens = $this->_tokenize($value); // get an array of tokens
+
+        // remove surrounding brackets
+        if ($tokens[0] == '(') array_shift($tokens);
+        if ($tokens[count($tokens) - 1] == ')') array_pop($tokens); // -1 doesnt work on arrays :-(
+
+        $schema_entry['oid'] = array_shift($tokens); // first token is the oid
+
+        // cycle over the tokens until none are left
+        while (count($tokens) > 0) {
+            $token = strtolower(array_shift($tokens));
+            if (in_array($token, $noValue)) {
+                $schema_entry[$token] = 1; // single value token
+            } else {
+                // this one follows a string or a list if it is multivalued
+                if (($schema_entry[$token] = array_shift($tokens)) == '(') {
+                    // this creates the list of values and cycles through the tokens
+                    // until the end of the list is reached ')'
+                    $schema_entry[$token] = array();
+                    while ($tmp = array_shift($tokens)) {
+                        if ($tmp == ')') break;
+                        if ($tmp != '$') array_push($schema_entry[$token], $tmp);
+                    }
+                }
+                // create a array if the value should be multivalued but was not
+                if (in_array($token, $multiValue) && !is_array($schema_entry[$token])) {
+                    $schema_entry[$token] = array($schema_entry[$token]);
+                }
+            }
+        }
+        // get max length from syntax
+        if (key_exists('syntax', $schema_entry)) {
+            if (preg_match('/{(\d+)}/', $schema_entry['syntax'], $matches)) {
+                $schema_entry['max_length'] = $matches[1];
+            }
+        }
+        // force a name
+        if (empty($schema_entry['name'])) {
+            $schema_entry['name'] = $schema_entry['oid'];
+        }
+        // make one name the default and put the other ones into aliases
+        if (is_array($schema_entry['name'])) {
+            $aliases                 = $schema_entry['name'];
+            $schema_entry['name']    = array_shift($aliases);
+            $schema_entry['aliases'] = $aliases;
+        }
+        return $schema_entry;
+    }
+
+    /**
+    * Tokenizes the given value into an array of tokens
+    *
+    * @param string $value String to parse
+    *
+    * @access protected
+    * @return array Array of tokens
+    */
+    protected function _tokenize($value)
+    {
+        $tokens  = array();       // array of tokens
+        $matches = array();       // matches[0] full pattern match, [1,2,3] subpatterns
+
+        // this one is taken from perl-ldap, modified for php
+        $pattern = "/\s* (?:([()]) | ([^'\s()]+) | '((?:[^']+|'[^\s)])*)') \s*/x";
+
+        /**
+         * This one matches one big pattern wherin only one of the three subpatterns matched
+         * We are interested in the subpatterns that matched. If it matched its value will be
+         * non-empty and so it is a token. Tokens may be round brackets, a string, or a string
+         * enclosed by '
+         */
+        preg_match_all($pattern, $value, $matches);
+
+        for ($i = 0; $i < count($matches[0]); $i++) {     // number of tokens (full pattern match)
+            for ($j = 1; $j < 4; $j++) {                  // each subpattern
+                if (null != trim($matches[$j][$i])) {     // pattern match in this subpattern
+                    $tokens[$i] = trim($matches[$j][$i]); // this is the token
+                }
+            }
+        }
+        return $tokens;
+    }
+
+    /**
+    * Returns wether a attribute syntax is binary or not
+    *
+    * This method gets used by Net_LDAP2_Entry to decide which
+    * PHP function needs to be used to fetch the value in the
+    * proper format (e.g. binary or string)
+    *
+    * @param string $attribute The name of the attribute (eg.: 'sn')
+    *
+    * @access public
+    * @return boolean
+    */
+    public function isBinary($attribute)
+    {
+        $return = false; // default to false
+
+        // This list contains all syntax that should be treaten as
+        // containing binary values
+        // The Syntax Definitons go into constants at the top of this page
+        $syntax_binary = array(
+                           NET_LDAP2_SYNTAX_OCTET_STRING,
+                           NET_LDAP2_SYNTAX_JPEG
+                         );
+
+        // Check Syntax
+        $attr_s = $this->get('attribute', $attribute);
+        if (Net_LDAP2::isError($attr_s)) {
+            // Attribute not found in schema
+            $return = false; // consider attr not binary
+        } elseif (isset($attr_s['syntax']) && in_array($attr_s['syntax'], $syntax_binary)) {
+            // Syntax is defined as binary in schema
+            $return = true;
+        } else {
+            // Syntax not defined as binary, or not found
+            // if attribute is a subtype, check superior attribute syntaxes
+            if (isset($attr_s['sup'])) {
+                foreach ($attr_s['sup'] as $superattr) {
+                    $return = $this->isBinary($superattr);
+                    if ($return) {
+                        break; // stop checking parents since we are binary
+                    }
+                }
+            }
+        }
+
+        return $return;
+    }
+
+    // [TODO] add method that allows us to see to which objectclasses a certain attribute belongs to
+    // it should return the result structured, e.g. sorted in "may" and "must". Optionally it should
+    // be able to return it just "flat", e.g. array_merge()d.
+    // We could use get_all() to achieve this easily, i think
+}
+?>
diff --git a/extlib/Net/LDAP2/SchemaCache.interface.php b/extlib/Net/LDAP2/SchemaCache.interface.php
new file mode 100644
index 000000000..e0c3094c4
--- /dev/null
+++ b/extlib/Net/LDAP2/SchemaCache.interface.php
@@ -0,0 +1,59 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_SchemaCache interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: SchemaCache.interface.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Interface describing a custom schema cache object
+*
+* To implement a custom schema cache, one must implement this interface and
+* pass the instanciated object to Net_LDAP2s registerSchemaCache() method.
+*/
+interface Net_LDAP2_SchemaCache
+{
+    /**
+    * Return the schema object from the cache
+    *
+    * Net_LDAP2 will consider anything returned invalid, except
+    * a valid Net_LDAP2_Schema object.
+    * In case you return a Net_LDAP2_Error, this error will be routed
+    * to the return of the $ldap->schema() call.
+    * If you return something else, Net_LDAP2 will
+    * fetch a fresh Schema object from the LDAP server.
+    *
+    * You may want to implement a cache aging mechanism here too.
+    *
+    * @return Net_LDAP2_Schema|Net_LDAP2_Error|false
+    */
+    public function loadSchema();
+
+    /**
+    * Store a schema object in the cache
+    *
+    * This method will be called, if Net_LDAP2 has fetched a fresh
+    * schema object from LDAP and wants to init or refresh the cache.
+    *
+    * In case of errors you may return a Net_LDAP2_Error which will
+    * be routet to the client.
+    * Note that doing this prevents, that the schema object fetched from LDAP
+    * will be given back to the client, so only return errors if storing
+    * of the cache is something crucial (e.g. for doing something else with it).
+    * Normaly you dont want to give back errors in which case Net_LDAP2 needs to
+    * fetch the schema once per script run and instead use the error
+    * returned from loadSchema().
+    *
+    * @return true|Net_LDAP2_Error
+    */
+    public function storeSchema($schema);
+}
diff --git a/extlib/Net/LDAP2/Search.php b/extlib/Net/LDAP2/Search.php
new file mode 100644
index 000000000..de4fde122
--- /dev/null
+++ b/extlib/Net/LDAP2/Search.php
@@ -0,0 +1,614 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Search interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Tarjej Huse, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: Search.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Result set of an LDAP search
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Tarjej Huse <tarjei@bergfald.no>
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_Search extends PEAR implements Iterator
+{
+    /**
+    * Search result identifier
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_search;
+
+    /**
+    * LDAP resource link
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_link;
+
+    /**
+    * Net_LDAP2 object
+    *
+    * A reference of the Net_LDAP2 object for passing to Net_LDAP2_Entry
+    *
+    * @access protected
+    * @var object Net_LDAP2
+    */
+    protected $_ldap;
+
+    /**
+    * Result entry identifier
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_entry = null;
+
+    /**
+    * The errorcode the search got
+    *
+    * Some errorcodes might be of interest, but might not be best handled as errors.
+    * examples: 4 - LDAP_SIZELIMIT_EXCEEDED - indicates a huge search.
+    *               Incomplete results are returned. If you just want to check if there's anything in the search.
+    *               than this is a point to handle.
+    *           32 - no such object - search here returns a count of 0.
+    *
+    * @access protected
+    * @var int
+    */
+    protected $_errorCode = 0; // if not set - sucess!
+
+    /**
+    * Cache for all entries already fetched from iterator interface
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_iteratorCache = array();
+
+    /**
+    * What attributes we searched for
+    *
+    * The $attributes array contains the names of the searched attributes and gets
+    * passed from $Net_LDAP2->search() so the Net_LDAP2_Search object can tell
+    * what attributes was searched for ({@link searchedAttrs())
+    *
+    * This variable gets set from the constructor and returned
+    * from {@link searchedAttrs()}
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_searchedAttrs = array();
+
+    /**
+    * Cache variable for storing entries fetched internally
+    *
+    * This currently is only used by {@link pop_entry()}
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_entry_cache = false;
+
+    /**
+    * Constructor
+    *
+    * @param resource           &$search    Search result identifier
+    * @param Net_LDAP2|resource &$ldap      Net_LDAP2 object or just a LDAP-Link resource
+    * @param array              $attributes (optional) Array with searched attribute names. (see {@link $_searchedAttrs})
+    *
+    * @access public
+    */
+    public function __construct(&$search, &$ldap, $attributes = array())
+    {
+        $this->PEAR('Net_LDAP2_Error');
+
+        $this->setSearch($search);
+
+        if ($ldap instanceof Net_LDAP2) {
+            $this->_ldap =& $ldap;
+            $this->setLink($this->_ldap->getLink());
+        } else {
+            $this->setLink($ldap);
+        }
+
+        $this->_errorCode = @ldap_errno($this->_link);
+
+        if (is_array($attributes) && !empty($attributes)) {
+            $this->_searchedAttrs = $attributes;
+        }
+    }
+
+    /**
+    * Returns an array of entry objects
+    *
+    * @return array Array of entry objects.
+    */
+    public function entries()
+    {
+        $entries = array();
+
+        while ($entry = $this->shiftEntry()) {
+            $entries[] = $entry;
+        }
+
+        return $entries;
+    }
+
+    /**
+    * Get the next entry in the searchresult.
+    *
+    * This will return a valid Net_LDAP2_Entry object or false, so
+    * you can use this method to easily iterate over the entries inside
+    * a while loop.
+    *
+    * @return Net_LDAP2_Entry|false  Reference to Net_LDAP2_Entry object or false
+    */
+    public function &shiftEntry()
+    {
+        if ($this->count() == 0 ) {
+            $false = false;
+            return $false;
+        }
+
+        if (is_null($this->_entry)) {
+            $this->_entry = @ldap_first_entry($this->_link, $this->_search);
+            $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry);
+            if ($entry instanceof Net_LDAP2_Error) $entry = false;
+        } else {
+            if (!$this->_entry = @ldap_next_entry($this->_link, $this->_entry)) {
+                $false = false;
+                return $false;
+            }
+            $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry);
+            if ($entry instanceof Net_LDAP2_Error) $entry = false;
+        }
+        return $entry;
+    }
+
+    /**
+    * Alias function of shiftEntry() for perl-ldap interface
+    *
+    * @see shiftEntry()
+    * @return Net_LDAP2_Entry|false
+    */
+    public function shift_entry()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'shiftEntry' ), $args);
+    }
+
+    /**
+    * Retrieve the next entry in the searchresult, but starting from last entry
+    *
+    * This is the opposite to {@link shiftEntry()} and is also very useful
+    * to be used inside a while loop.
+    *
+    * @return Net_LDAP2_Entry|false
+    */
+    public function popEntry()
+    {
+        if (false === $this->_entry_cache) {
+            // fetch entries into cache if not done so far
+            $this->_entry_cache = $this->entries();
+        }
+
+        $return = array_pop($this->_entry_cache);
+        return (null === $return)? false : $return;
+    }
+
+    /**
+    * Alias function of popEntry() for perl-ldap interface
+    *
+    * @see popEntry()
+    * @return Net_LDAP2_Entry|false
+    */
+    public function pop_entry()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'popEntry' ), $args);
+    }
+
+    /**
+    * Return entries sorted as array
+    *
+    * This returns a array with sorted entries and the values.
+    * Sorting is done with PHPs {@link array_multisort()}.
+    * This method relies on {@link as_struct()} to fetch the raw data of the entries.
+    *
+    * Please note that attribute names are case sensitive!
+    *
+    * Usage example:
+    * <code>
+    *   // to sort entries first by location, then by surename, but descending:
+    *   $entries = $search->sorted_as_struct(array('locality','sn'), SORT_DESC);
+    * </code>
+    *
+    * @param array $attrs Array of attribute names to sort; order from left to right.
+    * @param int   $order Ordering direction, either constant SORT_ASC or SORT_DESC
+    *
+    * @return array|Net_LDAP2_Error   Array with sorted entries or error
+    * @todo what about server side sorting as specified in http://www.ietf.org/rfc/rfc2891.txt?
+    */
+    public function sorted_as_struct($attrs = array('cn'), $order = SORT_ASC)
+    {
+        /*
+        * Old Code, suitable and fast for single valued sorting
+        * This code should be used if we know that single valued sorting is desired,
+        * but we need some method to get that knowledge...
+        */
+        /*
+        $attrs = array_reverse($attrs);
+        foreach ($attrs as $attribute) {
+            if (!ldap_sort($this->_link, $this->_search, $attribute)){
+                $this->raiseError("Sorting failed for Attribute " . $attribute);
+            }
+        }
+
+        $results = ldap_get_entries($this->_link, $this->_search);
+
+        unset($results['count']); //for tidier output
+        if ($order) {
+            return array_reverse($results);
+        } else {
+            return $results;
+        }*/
+
+        /*
+        * New code: complete "client side" sorting
+        */
+        // first some parameterchecks
+        if (!is_array($attrs)) {
+            return PEAR::raiseError("Sorting failed: Parameterlist must be an array!");
+        }
+        if ($order != SORT_ASC && $order != SORT_DESC) {
+            return PEAR::raiseError("Sorting failed: sorting direction not understood! (neither constant SORT_ASC nor SORT_DESC)");
+        }
+
+        // fetch the entries data
+        $entries = $this->as_struct();
+
+        // now sort each entries attribute values
+        // this is neccessary because later we can only sort by one value,
+        // so we need the highest or lowest attribute now, depending on the
+        // selected ordering for that specific attribute
+        foreach ($entries as $dn => $entry) {
+            foreach ($entry as $attr_name => $attr_values) {
+                sort($entries[$dn][$attr_name]);
+                if ($order == SORT_DESC) {
+                    array_reverse($entries[$dn][$attr_name]);
+                }
+            }
+        }
+
+        // reformat entrys array for later use with array_multisort()
+        $to_sort = array(); // <- will be a numeric array similar to ldap_get_entries
+        foreach ($entries as $dn => $entry_attr) {
+            $row       = array();
+            $row['dn'] = $dn;
+            foreach ($entry_attr as $attr_name => $attr_values) {
+                $row[$attr_name] = $attr_values;
+            }
+            $to_sort[] = $row;
+        }
+
+        // Build columns for array_multisort()
+        // each requested attribute is one row
+        $columns = array();
+        foreach ($attrs as $attr_name) {
+            foreach ($to_sort as $key => $row) {
+                $columns[$attr_name][$key] =& $to_sort[$key][$attr_name][0];
+            }
+        }
+
+        // sort the colums with array_multisort, if there is something
+        // to sort and if we have requested sort columns
+        if (!empty($to_sort) && !empty($columns)) {
+            $sort_params = '';
+            foreach ($attrs as $attr_name) {
+                $sort_params .= '$columns[\''.$attr_name.'\'], '.$order.', ';
+            }
+            eval("array_multisort($sort_params \$to_sort);"); // perform sorting
+        }
+
+        return $to_sort;
+    }
+
+    /**
+    * Return entries sorted as objects
+    *
+    * This returns a array with sorted Net_LDAP2_Entry objects.
+    * The sorting is actually done with {@link sorted_as_struct()}.
+    *
+    * Please note that attribute names are case sensitive!
+    * Also note, that it is (depending on server capabilitys) possible to let
+    * the server sort your results. This happens through search controls
+    * and is described in detail at {@link http://www.ietf.org/rfc/rfc2891.txt}
+    *
+    * Usage example:
+    * <code>
+    *   // to sort entries first by location, then by surename, but descending:
+    *   $entries = $search->sorted(array('locality','sn'), SORT_DESC);
+    * </code>
+    *
+    * @param array $attrs Array of sort attributes to sort; order from left to right.
+    * @param int   $order Ordering direction, either constant SORT_ASC or SORT_DESC
+    *
+    * @return array|Net_LDAP2_Error   Array with sorted Net_LDAP2_Entries or error
+    * @todo Entry object construction could be faster. Maybe we could use one of the factorys instead of fetching the entry again
+    */
+    public function sorted($attrs = array('cn'), $order = SORT_ASC)
+    {
+        $return = array();
+        $sorted = $this->sorted_as_struct($attrs, $order);
+        if (PEAR::isError($sorted)) {
+            return $sorted;
+        }
+        foreach ($sorted as $key => $row) {
+            $entry = $this->_ldap->getEntry($row['dn'], $this->searchedAttrs());
+            if (!PEAR::isError($entry)) {
+                array_push($return, $entry);
+            } else {
+                return $entry;
+            }
+        }
+        return $return;
+    }
+
+    /**
+    * Return entries as array
+    *
+    * This method returns the entries and the selected attributes values as
+    * array.
+    * The first array level contains all found entries where the keys are the
+    * DNs of the entries. The second level arrays contian the entries attributes
+    * such that the keys is the lowercased name of the attribute and the values
+    * are stored in another indexed array. Note that the attribute values are stored
+    * in an array even if there is no or just one value.
+    *
+    * The array has the following structure:
+    * <code>
+    * $return = array(
+    *           'cn=foo,dc=example,dc=com' => array(
+    *                                                'sn'       => array('foo'),
+    *                                                'multival' => array('val1', 'val2', 'valN')
+    *                                             )
+    *           'cn=bar,dc=example,dc=com' => array(
+    *                                                'sn'       => array('bar'),
+    *                                                'multival' => array('val1', 'valN')
+    *                                             )
+    *           )
+    * </code>
+    *
+    * @return array      associative result array as described above
+    */
+    public function as_struct()
+    {
+        $return  = array();
+        $entries = $this->entries();
+        foreach ($entries as $entry) {
+            $attrs            = array();
+            $entry_attributes = $entry->attributes();
+            foreach ($entry_attributes as $attr_name) {
+                $attr_values = $entry->getValue($attr_name, 'all');
+                if (!is_array($attr_values)) {
+                    $attr_values = array($attr_values);
+                }
+                $attrs[$attr_name] = $attr_values;
+            }
+            $return[$entry->dn()] = $attrs;
+        }
+        return $return;
+    }
+
+    /**
+    * Set the search objects resource link
+    *
+    * @param resource &$search Search result identifier
+    *
+    * @access public
+    * @return void
+    */
+    public function setSearch(&$search)
+    {
+        $this->_search = $search;
+    }
+
+    /**
+    * Set the ldap ressource link
+    *
+    * @param resource &$link Link identifier
+    *
+    * @access public
+    * @return void
+    */
+    public function setLink(&$link)
+    {
+        $this->_link = $link;
+    }
+
+    /**
+    * Returns the number of entries in the searchresult
+    *
+    * @return int Number of entries in search.
+    */
+    public function count()
+    {
+        // this catches the situation where OL returned errno 32 = no such object!
+        if (!$this->_search) {
+            return 0;
+        }
+        return @ldap_count_entries($this->_link, $this->_search);
+    }
+
+    /**
+    * Get the errorcode the object got in its search.
+    *
+    * @return int The ldap error number.
+    */
+    public function getErrorCode()
+    {
+        return $this->_errorCode;
+    }
+
+    /**
+    * Destructor
+    *
+    * @access protected
+    */
+    public function _Net_LDAP2_Search()
+    {
+        @ldap_free_result($this->_search);
+    }
+
+    /**
+    * Closes search result
+    *
+    * @return void
+    */
+    public function done()
+    {
+        $this->_Net_LDAP2_Search();
+    }
+
+    /**
+    * Return the attribute names this search selected
+    *
+    * @return array
+    * @see $_searchedAttrs
+    * @access protected
+    */
+    protected function searchedAttrs()
+    {
+        return $this->_searchedAttrs;
+    }
+
+    /**
+    * Tells if this search exceeds a sizelimit
+    *
+    * @return boolean
+    */
+    public function sizeLimitExceeded()
+    {
+        return ($this->getErrorCode() == 4);
+    }
+
+
+    /*
+    * SPL Iterator interface methods.
+    * This interface allows to use Net_LDAP2_Search
+    * objects directly inside a foreach loop!
+    */
+    /**
+    * SPL Iterator interface: Return the current element.
+    *
+    * The SPL Iterator interface allows you to fetch entries inside
+    * a foreach() loop: <code>foreach ($search as $dn => $entry) { ...</code>
+    *
+    * Of course, you may call {@link current()}, {@link key()}, {@link next()},
+    * {@link rewind()} and {@link valid()} yourself.
+    *
+    * If the search throwed an error, it returns false.
+    * False is also returned, if the end is reached
+    * In case no call to next() was made, we will issue one,
+    * thus returning the first entry.
+    *
+    * @return Net_LDAP2_Entry|false
+    */
+    public function current()
+    {
+        if (count($this->_iteratorCache) == 0) {
+            $this->next();
+            reset($this->_iteratorCache);
+        }
+        $entry = current($this->_iteratorCache);
+        return ($entry instanceof Net_LDAP2_Entry)? $entry : false;
+    }
+
+    /**
+    * SPL Iterator interface: Return the identifying key (DN) of the current entry.
+    *
+    * @see current()
+    * @return string|false DN of the current entry; false in case no entry is returned by current()
+    */
+    public function key()
+    {
+        $entry = $this->current();
+        return ($entry instanceof Net_LDAP2_Entry)? $entry->dn() :false;
+    }
+
+    /**
+    * SPL Iterator interface: Move forward to next entry.
+    *
+    * After a call to {@link next()}, {@link current()} will return
+    * the next entry in the result set.
+    *
+    * @see current()
+    * @return void
+    */
+    public function next()
+    {
+        // fetch next entry.
+        // if we have no entrys anymore, we add false (which is
+        // returned by shiftEntry()) so current() will complain.
+        if (count($this->_iteratorCache) - 1 <= $this->count()) {
+            $this->_iteratorCache[] = $this->shiftEntry();
+        }
+
+        // move on array pointer to current element.
+        // even if we have added all entries, this will
+        // ensure proper operation in case we rewind()
+        next($this->_iteratorCache);
+    }
+
+    /**
+    * SPL Iterator interface:  Check if there is a current element after calls to {@link rewind()} or {@link next()}.
+    *
+    * Used to check if we've iterated to the end of the collection.
+    *
+    * @see current()
+    * @return boolean FALSE if there's nothing more to iterate over
+    */
+    public function valid()
+    {
+        return ($this->current() instanceof Net_LDAP2_Entry);
+    }
+
+    /**
+    * SPL Iterator interface: Rewind the Iterator to the first element.
+    *
+    * After rewinding, {@link current()} will return the first entry in the result set.
+    *
+    * @see current()
+    * @return void
+    */
+    public function rewind()
+    {
+        reset($this->_iteratorCache);
+    }
+}
+
+?>
diff --git a/extlib/Net/LDAP2/SimpleFileSchemaCache.php b/extlib/Net/LDAP2/SimpleFileSchemaCache.php
new file mode 100644
index 000000000..8019654ac
--- /dev/null
+++ b/extlib/Net/LDAP2/SimpleFileSchemaCache.php
@@ -0,0 +1,97 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the example simple file based Schema Caching class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: SimpleFileSchemaCache.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* A simple file based schema cacher with cache aging.
+*
+* Once the cache is too old, the loadSchema() method will return false, so
+* Net_LDAP2 will fetch a fresh object from the LDAP server that will
+* overwrite the current (outdated) old cache.
+*/
+class Net_LDAP2_SimpleFileSchemaCache implements Net_LDAP2_SchemaCache
+{
+    /**
+    * Internal config of this cache
+    *
+    * @see Net_LDAP2_SimpleFileSchemaCache()
+    * @var array
+    */
+    protected $config = array(
+        'path'    => '/tmp/Net_LDAP_Schema.cache',
+        'max_age' => 1200
+    );
+
+    /**
+    * Initialize the simple cache
+    *
+    * Config is as following:
+    *  path     Complete path to the cache file.
+    *  max_age  Maximum age of cache in seconds, 0 means "endlessly".
+    *
+    * @param array $cfg Config array
+    */
+    public function Net_LDAP2_SimpleFileSchemaCache($cfg)
+    {
+    	foreach ($cfg as $key => $value) {
+			if (array_key_exists($key, $this->config)) {
+				if (gettype($this->config[$key]) != gettype($value)) {
+					$this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key does not match type ".gettype($this->config[$key])."!");
+				}
+				$this->config[$key] = $value;
+			} else {
+				$this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key is not defined!");
+			}
+		}
+    }
+
+    /**
+    * Return the schema object from the cache
+    *
+    * If file is existent and cache has not expired yet,
+    * then the cache is deserialized and returned.
+    *
+    * @return Net_LDAP2_Schema|Net_LDAP2_Error|false
+    */
+    public function loadSchema()
+    {
+         $return = false; // Net_LDAP2 will load schema from LDAP
+         if (file_exists($this->config['path'])) {
+             $cache_maxage = filemtime($this->config['path']) + $this->config['max_age'];
+             if (time() <= $cache_maxage || $this->config['max_age'] == 0) {
+                 $return = unserialize(file_get_contents($this->config['path']));
+             }
+         }
+         return $return;
+    }
+
+    /**
+    * Store a schema object in the cache
+    *
+    * This method will be called, if Net_LDAP2 has fetched a fresh
+    * schema object from LDAP and wants to init or refresh the cache.
+    *
+    * To invalidate the cache and cause Net_LDAP2 to refresh the cache,
+    * you can call this method with null or false as value.
+    * The next call to $ldap->schema() will then refresh the caches object.
+    *
+    * @param mixed $schema The object that should be cached
+    * @return true|Net_LDAP2_Error|false
+    */
+    public function storeSchema($schema) {
+        file_put_contents($this->config['path'], serialize($schema));
+        return true;
+    }
+}
diff --git a/extlib/Net/LDAP2/Util.php b/extlib/Net/LDAP2/Util.php
new file mode 100644
index 000000000..48b03f9f9
--- /dev/null
+++ b/extlib/Net/LDAP2/Util.php
@@ -0,0 +1,572 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Util interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: Util.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Utility Class for Net_LDAP2
+*
+* This class servers some functionality to the other classes of Net_LDAP2 but most of
+* the methods can be used separately as well.
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_Util extends PEAR
+{
+    /**
+     * Constructor
+     *
+     * @access public
+     */
+    public function __construct()
+    {
+         // We do nothing here, since all methods can be called statically.
+         // In Net_LDAP <= 0.7, we needed a instance of Util, because
+         // it was possible to do utf8 encoding and decoding, but this
+         // has been moved to the LDAP class. The constructor remains only
+         // here to document the downward compatibility of creating an instance.
+    }
+
+    /**
+    * Explodes the given DN into its elements
+    *
+    * {@link http://www.ietf.org/rfc/rfc2253.txt RFC 2253} says, a Distinguished Name is a sequence
+    * of Relative Distinguished Names (RDNs), which themselves
+    * are sets of Attributes. For each RDN a array is constructed where the RDN part is stored.
+    *
+    * For example, the DN 'OU=Sales+CN=J. Smith,DC=example,DC=net' is exploded to:
+    * <kbd>array( [0] => array([0] => 'OU=Sales', [1] => 'CN=J. Smith'), [2] => 'DC=example', [3] => 'DC=net' )</kbd>
+    *
+    * [NOT IMPLEMENTED] DNs might also contain values, which are the bytes of the BER encoding of
+    * the X.500 AttributeValue rather than some LDAP string syntax. These values are hex-encoded
+    * and prefixed with a #. To distinguish such BER values, ldap_explode_dn uses references to
+    * the actual values, e.g. '1.3.6.1.4.1.1466.0=#04024869,DC=example,DC=com' is exploded to:
+    * [ { '1.3.6.1.4.1.1466.0' => "\004\002Hi" }, { 'DC' => 'example' }, { 'DC' => 'com' } ];
+    * See {@link http://www.vijaymukhi.com/vmis/berldap.htm} for more information on BER.
+    *
+    *  It also performs the following operations on the given DN:
+    *   - Unescape "\" followed by ",", "+", """, "\", "<", ">", ";", "#", "=", " ", or a hexpair
+    *     and strings beginning with "#".
+    *   - Removes the leading 'OID.' characters if the type is an OID instead of a name.
+    *   - If an RDN contains multiple parts, the parts are re-ordered so that the attribute type names are in alphabetical order.
+    *
+    * OPTIONS is a list of name/value pairs, valid options are:
+    *   casefold    Controls case folding of attribute types names.
+    *               Attribute values are not affected by this option.
+    *               The default is to uppercase. Valid values are:
+    *               lower        Lowercase attribute types names.
+    *               upper        Uppercase attribute type names. This is the default.
+    *               none         Do not change attribute type names.
+    *   reverse     If TRUE, the RDN sequence is reversed.
+    *   onlyvalues  If TRUE, then only attributes values are returned ('foo' instead of 'cn=foo')
+    *
+
+    * @param string $dn      The DN that should be exploded
+    * @param array  $options Options to use
+    *
+    * @static
+    * @return array   Parts of the exploded DN
+    * @todo implement BER
+    */
+    public static function ldap_explode_dn($dn, $options = array('casefold' => 'upper'))
+    {
+        if (!isset($options['onlyvalues'])) $options['onlyvalues']  = false;
+        if (!isset($options['reverse']))    $options['reverse']     = false;
+        if (!isset($options['casefold']))   $options['casefold']    = 'upper';
+
+        // Escaping of DN and stripping of "OID."
+        $dn = self::canonical_dn($dn, array('casefold' => $options['casefold']));
+
+        // splitting the DN
+        $dn_array = preg_split('/(?<=[^\\\\]),/', $dn);
+
+        // clear wrong splitting (possibly we have split too much)
+        // /!\ Not clear, if this is neccessary here
+        //$dn_array = self::correct_dn_splitting($dn_array, ',');
+
+        // construct subarrays for multivalued RDNs and unescape DN value
+        // also convert to output format and apply casefolding
+        foreach ($dn_array as $key => $value) {
+            $value_u = self::unescape_dn_value($value);
+            $rdns    = self::split_rdn_multival($value_u[0]);
+            if (count($rdns) > 1) {
+                // MV RDN!
+                foreach ($rdns as $subrdn_k => $subrdn_v) {
+                    // Casefolding
+                    if ($options['casefold'] == 'upper') $subrdn_v = preg_replace("/^(\w+=)/e", "''.strtoupper('\\1').''", $subrdn_v);
+                    if ($options['casefold'] == 'lower') $subrdn_v = preg_replace("/^(\w+=)/e", "''.strtolower('\\1').''", $subrdn_v);
+
+                    if ($options['onlyvalues']) {
+                        preg_match('/(.+?)(?<!\\\\)=(.+)/', $subrdn_v, $matches);
+                        $rdn_ocl         = $matches[1];
+                        $rdn_val         = $matches[2];
+                        $unescaped       = self::unescape_dn_value($rdn_val);
+                        $rdns[$subrdn_k] = $unescaped[0];
+                    } else {
+                        $unescaped = self::unescape_dn_value($subrdn_v);
+                        $rdns[$subrdn_k] = $unescaped[0];
+                    }
+                }
+
+                $dn_array[$key] = $rdns;
+            } else {
+                // normal RDN
+
+                // Casefolding
+                if ($options['casefold'] == 'upper') $value = preg_replace("/^(\w+=)/e", "''.strtoupper('\\1').''", $value);
+                if ($options['casefold'] == 'lower') $value = preg_replace("/^(\w+=)/e", "''.strtolower('\\1').''", $value);
+
+                if ($options['onlyvalues']) {
+                    preg_match('/(.+?)(?<!\\\\)=(.+)/', $value, $matches);
+                    $dn_ocl         = $matches[1];
+                    $dn_val         = $matches[2];
+                    $unescaped      = self::unescape_dn_value($dn_val);
+                    $dn_array[$key] = $unescaped[0];
+                } else {
+                    $unescaped = self::unescape_dn_value($value);
+                    $dn_array[$key] = $unescaped[0];
+                }
+            }
+        }
+
+        if ($options['reverse']) {
+            return array_reverse($dn_array);
+        } else {
+            return $dn_array;
+        }
+    }
+
+    /**
+    * Escapes a DN value according to RFC 2253
+    *
+    * Escapes the given VALUES according to RFC 2253 so that they can be safely used in LDAP DNs.
+    * The characters ",", "+", """, "\", "<", ">", ";", "#", "=" with a special meaning in RFC 2252
+    * are preceeded by ba backslash. Control characters with an ASCII code < 32 are represented as \hexpair.
+    * Finally all leading and trailing spaces are converted to sequences of \20.
+    *
+    * @param array $values An array containing the DN values that should be escaped
+    *
+    * @static
+    * @return array The array $values, but escaped
+    */
+    public static function escape_dn_value($values = array())
+    {
+        // Parameter validation
+        if (!is_array($values)) {
+            $values = array($values);
+        }
+
+        foreach ($values as $key => $val) {
+            // Escaping of filter meta characters
+            $val = str_replace('\\', '\\\\', $val);
+            $val = str_replace(',',    '\,', $val);
+            $val = str_replace('+',    '\+', $val);
+            $val = str_replace('"',    '\"', $val);
+            $val = str_replace('<',    '\<', $val);
+            $val = str_replace('>',    '\>', $val);
+            $val = str_replace(';',    '\;', $val);
+            $val = str_replace('#',    '\#', $val);
+            $val = str_replace('=',    '\=', $val);
+
+            // ASCII < 32 escaping
+            $val = self::asc2hex32($val);
+
+            // Convert all leading and trailing spaces to sequences of \20.
+            if (preg_match('/^(\s*)(.+?)(\s*)$/', $val, $matches)) {
+                $val = $matches[2];
+                for ($i = 0; $i < strlen($matches[1]); $i++) {
+                    $val = '\20'.$val;
+                }
+                for ($i = 0; $i < strlen($matches[3]); $i++) {
+                    $val = $val.'\20';
+                }
+            }
+
+            if (null === $val) $val = '\0';  // apply escaped "null" if string is empty
+
+            $values[$key] = $val;
+        }
+
+        return $values;
+    }
+
+    /**
+    * Undoes the conversion done by escape_dn_value().
+    *
+    * Any escape sequence starting with a baskslash - hexpair or special character -
+    * will be transformed back to the corresponding character.
+    *
+    * @param array $values Array of DN Values
+    *
+    * @return array Same as $values, but unescaped
+    * @static
+    */
+    public static function unescape_dn_value($values = array())
+    {
+        // Parameter validation
+        if (!is_array($values)) {
+            $values = array($values);
+        }
+
+        foreach ($values as $key => $val) {
+            // strip slashes from special chars
+            $val = str_replace('\\\\', '\\', $val);
+            $val = str_replace('\,',    ',', $val);
+            $val = str_replace('\+',    '+', $val);
+            $val = str_replace('\"',    '"', $val);
+            $val = str_replace('\<',    '<', $val);
+            $val = str_replace('\>',    '>', $val);
+            $val = str_replace('\;',    ';', $val);
+            $val = str_replace('\#',    '#', $val);
+            $val = str_replace('\=',    '=', $val);
+
+            // Translate hex code into ascii
+            $values[$key] = self::hex2asc($val);
+        }
+
+        return $values;
+    }
+
+    /**
+    * Returns the given DN in a canonical form
+    *
+    * Returns false if DN is not a valid Distinguished Name.
+    * DN can either be a string or an array
+    * as returned by ldap_explode_dn, which is useful when constructing a DN.
+    * The DN array may have be indexed (each array value is a OCL=VALUE pair)
+    * or associative (array key is OCL and value is VALUE).
+    *
+    * It performs the following operations on the given DN:
+    *     - Removes the leading 'OID.' characters if the type is an OID instead of a name.
+    *     - Escapes all RFC 2253 special characters (",", "+", """, "\", "<", ">", ";", "#", "="), slashes ("/"), and any other character where the ASCII code is < 32 as \hexpair.
+    *     - Converts all leading and trailing spaces in values to be \20.
+    *     - If an RDN contains multiple parts, the parts are re-ordered so that the attribute type names are in alphabetical order.
+    *
+    * OPTIONS is a list of name/value pairs, valid options are:
+    *     casefold    Controls case folding of attribute type names.
+    *                 Attribute values are not affected by this option. The default is to uppercase.
+    *                 Valid values are:
+    *                 lower        Lowercase attribute type names.
+    *                 upper        Uppercase attribute type names. This is the default.
+    *                 none         Do not change attribute type names.
+    *     [NOT IMPLEMENTED] mbcescape   If TRUE, characters that are encoded as a multi-octet UTF-8 sequence will be escaped as \(hexpair){2,*}.
+    *     reverse     If TRUE, the RDN sequence is reversed.
+    *     separator   Separator to use between RDNs. Defaults to comma (',').
+    *
+    * Note: The empty string "" is a valid DN, so be sure not to do a "$can_dn == false" test,
+    *       because an empty string evaluates to false. Use the "===" operator instead.
+    *
+    * @param array|string $dn      The DN
+    * @param array        $options Options to use
+    *
+    * @static
+    * @return false|string The canonical DN or FALSE
+    * @todo implement option mbcescape
+    */
+    public static function canonical_dn($dn, $options = array('casefold' => 'upper', 'separator' => ','))
+    {
+        if ($dn === '') return $dn;  // empty DN is valid!
+
+        // options check
+        if (!isset($options['reverse'])) {
+            $options['reverse'] = false;
+        } else {
+            $options['reverse'] = true;
+        }
+        if (!isset($options['casefold']))  $options['casefold'] = 'upper';
+        if (!isset($options['separator'])) $options['separator'] = ',';
+
+
+        if (!is_array($dn)) {
+            // It is not clear to me if the perl implementation splits by the user defined
+            // separator or if it just uses this separator to construct the new DN
+            $dn = preg_split('/(?<=[^\\\\])'.$options['separator'].'/', $dn);
+
+            // clear wrong splitting (possibly we have split too much)
+            $dn = self::correct_dn_splitting($dn, $options['separator']);
+        } else {
+            // Is array, check, if the array is indexed or associative
+            $assoc = false;
+            foreach ($dn as $dn_key => $dn_part) {
+                if (!is_int($dn_key)) {
+                    $assoc = true;
+                }
+            }
+            // convert to indexed, if associative array detected
+            if ($assoc) {
+                $newdn = array();
+                foreach ($dn as $dn_key => $dn_part) {
+                    if (is_array($dn_part)) {
+                        ksort($dn_part, SORT_STRING); // we assume here, that the rdn parts are also associative
+                        $newdn[] = $dn_part;  // copy array as-is, so we can resolve it later
+                    } else {
+                        $newdn[] = $dn_key.'='.$dn_part;
+                    }
+                }
+                $dn =& $newdn;
+            }
+        }
+
+        // Escaping and casefolding
+        foreach ($dn as $pos => $dnval) {
+            if (is_array($dnval)) {
+                // subarray detected, this means very surely, that we had
+                // a multivalued dn part, which must be resolved
+                $dnval_new = '';
+                foreach ($dnval as $subkey => $subval) {
+                    // build RDN part
+                    if (!is_int($subkey)) {
+                        $subval = $subkey.'='.$subval;
+                    }
+                    $subval_processed = self::canonical_dn($subval);
+                    if (false === $subval_processed) return false;
+                    $dnval_new .= $subval_processed.'+';
+                }
+                $dn[$pos] = substr($dnval_new, 0, -1); // store RDN part, strip last plus
+            } else {
+                // try to split multivalued RDNS into array
+                $rdns = self::split_rdn_multival($dnval);
+                if (count($rdns) > 1) {
+                    // Multivalued RDN was detected!
+                    // The RDN value is expected to be correctly split by split_rdn_multival().
+                    // It's time to sort the RDN and build the DN!
+                    $rdn_string = '';
+                    sort($rdns, SORT_STRING); // Sort RDN keys alphabetically
+                    foreach ($rdns as $rdn) {
+                        $subval_processed = self::canonical_dn($rdn);
+                        if (false === $subval_processed) return false;
+                        $rdn_string .= $subval_processed.'+';
+                    }
+
+                    $dn[$pos] = substr($rdn_string, 0, -1); // store RDN part, strip last plus
+
+                } else {
+                    // no multivalued RDN!
+                    // split at first unescaped "="
+                    $dn_comp = preg_split('/(?<=[^\\\\])=/', $rdns[0], 2);
+                    $ocl     = ltrim($dn_comp[0]);  // trim left whitespaces 'cause of "cn=foo, l=bar" syntax (whitespace after comma)
+                    $val     = $dn_comp[1];
+
+                    // strip 'OID.', otherwise apply casefolding and escaping
+                    if (substr(strtolower($ocl), 0, 4) == 'oid.') {
+                        $ocl = substr($ocl, 4);
+                    } else {
+                        if ($options['casefold'] == 'upper') $ocl = strtoupper($ocl);
+                        if ($options['casefold'] == 'lower') $ocl = strtolower($ocl);
+                        $ocl = self::escape_dn_value(array($ocl));
+                        $ocl = $ocl[0];
+                    }
+
+                    // escaping of dn-value
+                    $val = self::escape_dn_value(array($val));
+                    $val = str_replace('/', '\/', $val[0]);
+
+                    $dn[$pos] = $ocl.'='.$val;
+                }
+            }
+        }
+
+        if ($options['reverse']) $dn = array_reverse($dn);
+        return implode($options['separator'], $dn);
+    }
+
+    /**
+    * Escapes the given VALUES according to RFC 2254 so that they can be safely used in LDAP filters.
+    *
+    * Any control characters with an ACII code < 32 as well as the characters with special meaning in
+    * LDAP filters "*", "(", ")", and "\" (the backslash) are converted into the representation of a
+    * backslash followed by two hex digits representing the hexadecimal value of the character.
+    *
+    * @param array $values Array of values to escape
+    *
+    * @static
+    * @return array Array $values, but escaped
+    */
+    public static function escape_filter_value($values = array())
+    {
+        // Parameter validation
+        if (!is_array($values)) {
+            $values = array($values);
+        }
+
+        foreach ($values as $key => $val) {
+            // Escaping of filter meta characters
+            $val = str_replace('\\', '\5c', $val);
+            $val = str_replace('*',  '\2a', $val);
+            $val = str_replace('(',  '\28', $val);
+            $val = str_replace(')',  '\29', $val);
+
+            // ASCII < 32 escaping
+            $val = self::asc2hex32($val);
+
+            if (null === $val) $val = '\0';  // apply escaped "null" if string is empty
+
+            $values[$key] = $val;
+        }
+
+        return $values;
+    }
+
+    /**
+    * Undoes the conversion done by {@link escape_filter_value()}.
+    *
+    * Converts any sequences of a backslash followed by two hex digits into the corresponding character.
+    *
+    * @param array $values Array of values to escape
+    *
+    * @static
+    * @return array Array $values, but unescaped
+    */
+    public static function unescape_filter_value($values = array())
+    {
+        // Parameter validation
+        if (!is_array($values)) {
+            $values = array($values);
+        }
+
+        foreach ($values as $key => $value) {
+            // Translate hex code into ascii
+            $values[$key] = self::hex2asc($value);
+        }
+
+        return $values;
+    }
+
+    /**
+    * Converts all ASCII chars < 32 to "\HEX"
+    *
+    * @param string $string String to convert
+    *
+    * @static
+    * @return string
+    */
+    public static function asc2hex32($string)
+    {
+        for ($i = 0; $i < strlen($string); $i++) {
+            $char = substr($string, $i, 1);
+            if (ord($char) < 32) {
+                $hex = dechex(ord($char));
+                if (strlen($hex) == 1) $hex = '0'.$hex;
+                $string = str_replace($char, '\\'.$hex, $string);
+            }
+        }
+        return $string;
+    }
+
+    /**
+    * Converts all Hex expressions ("\HEX") to their original ASCII characters
+    *
+    * @param string $string String to convert
+    *
+    * @static
+    * @author beni@php.net, heavily based on work from DavidSmith@byu.net
+    * @return string
+    */
+    public static function hex2asc($string)
+    {
+        $string = preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''", $string);
+        return $string;
+    }
+
+    /**
+    * Split an multivalued RDN value into an Array
+    *
+    * A RDN can contain multiple values, spearated by a plus sign.
+    * This function returns each separate ocl=value pair of the RDN part.
+    *
+    * If no multivalued RDN is detected, an array containing only
+    * the original rdn part is returned.
+    *
+    * For example, the multivalued RDN 'OU=Sales+CN=J. Smith' is exploded to:
+    * <kbd>array([0] => 'OU=Sales', [1] => 'CN=J. Smith')</kbd>
+    *
+    * The method trys to be smart if it encounters unescaped "+" characters, but may fail,
+    * so ensure escaped "+"es in attr names and attr values.
+    *
+    * [BUG] If you have a multivalued RDN with unescaped plus characters
+    *       and there is a unescaped plus sign at the end of an value followed by an
+    *       attribute name containing an unescaped plus, then you will get wrong splitting:
+    *         $rdn = 'OU=Sales+C+N=J. Smith';
+    *       returns:
+    *         array('OU=Sales+C', 'N=J. Smith');
+    *       The "C+" is treaten as value of the first pair instead as attr name of the second pair.
+    *       To prevent this, escape correctly.
+    *
+    * @param string $rdn Part of an (multivalued) escaped RDN (eg. ou=foo OR ou=foo+cn=bar)
+    *
+    * @static
+    * @return array Array with the components of the multivalued RDN or Error
+    */
+    public static function split_rdn_multival($rdn)
+    {
+        $rdns = preg_split('/(?<!\\\\)\+/', $rdn);
+        $rdns = self::correct_dn_splitting($rdns, '+');
+        return array_values($rdns);
+    }
+
+    /**
+    * Splits a attribute=value syntax into an array
+    *
+    * The split will occur at the first unescaped '=' character.
+    *
+    * @param string $attr Attribute and Value Syntax
+    *
+    * @return array Indexed array: 0=attribute name, 1=attribute value
+    */
+    public static function split_attribute_string($attr)
+    {
+        return preg_split('/(?<!\\\\)=/', $attr, 2);
+    }
+
+    /**
+    * Corrects splitting of dn parts
+    *
+    * @param array $dn        Raw DN array
+    * @param array $separator Separator that was used when splitting
+    *
+    * @return array Corrected array
+    * @access protected
+    */
+    protected static function correct_dn_splitting($dn = array(), $separator = ',')
+    {
+        foreach ($dn as $key => $dn_value) {
+            $dn_value = $dn[$key]; // refresh value (foreach caches!)
+            // if the dn_value is not in attr=value format, then we had an
+            // unescaped separator character inside the attr name or the value.
+            // We assume, that it was the attribute value.
+            // [TODO] To solve this, we might ask the schema. Keep in mind, that UTIL class
+            //        must remain independent from the other classes or connections.
+            if (!preg_match('/.+(?<!\\\\)=.+/', $dn_value)) {
+                unset($dn[$key]);
+                if (array_key_exists($key-1, $dn)) {
+                    $dn[$key-1] = $dn[$key-1].$separator.$dn_value; // append to previous attr value
+                } else {
+                    $dn[$key+1] = $dn_value.$separator.$dn[$key+1]; // first element: prepend to next attr name
+                }
+            }
+        }
+        return array_values($dn);
+    }
+}
+
+?>
diff --git a/extlib/Net/URL2.php b/extlib/Net/URL2.php
index 7a654aed8..f7fbcd9ce 100644
--- a/extlib/Net/URL2.php
+++ b/extlib/Net/URL2.php
@@ -1,44 +1,58 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Copyright (c) 2007-2008, Christian Schmidt, Peytz & Co. A/S           |
-// | All rights reserved.                                                  |
-// |                                                                       |
-// | Redistribution and use in source and binary forms, with or without    |
-// | modification, are permitted provided that the following conditions    |
-// | are met:                                                              |
-// |                                                                       |
-// | o Redistributions of source code must retain the above copyright      |
-// |   notice, this list of conditions and the following disclaimer.       |
-// | o Redistributions in binary form must reproduce the above copyright   |
-// |   notice, this list of conditions and the following disclaimer in the |
-// |   documentation and/or other materials provided with the distribution.|
-// | o The names of the authors may not be used to endorse or promote      |
-// |   products derived from this software without specific prior written  |
-// |   permission.                                                         |
-// |                                                                       |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  |
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      |
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   |
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  |
-// |                                                                       |
-// +-----------------------------------------------------------------------+
-// | Author: Christian Schmidt <schmidt at php dot net>                    |
-// +-----------------------------------------------------------------------+
-//
-// $Id: URL2.php,v 1.10 2008/04/26 21:57:08 schmidt Exp $
-//
-// Net_URL2 Class (PHP5 Only)
-
-// This code is released under the BSD License - http://www.opensource.org/licenses/bsd-license.php
 /**
- * @license BSD License
+ * Net_URL2, a class representing a URL as per RFC 3986.
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2007-2009, Peytz & Co. A/S
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the distribution.
+ *   * Neither the name of the PHP_LexerGenerator nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  Networking
+ * @package   Net_URL2
+ * @author    Christian Schmidt <chsc@peytz.dk>
+ * @copyright 2007-2008 Peytz & Co. A/S
+ * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version   CVS: $Id: URL2.php 286661 2009-08-02 12:50:54Z schmidt $
+ * @link      http://www.rfc-editor.org/rfc/rfc3986.txt
+ */
+
+/**
+ * Represents a URL as per RFC 3986.
+ *
+ * @category  Networking
+ * @package   Net_URL2
+ * @author    Christian Schmidt <chsc@peytz.dk>
+ * @copyright 2007-2008 Peytz & Co. ApS
+ * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/Net_URL2
  */
 class Net_URL2
 {
@@ -46,24 +60,24 @@ class Net_URL2
      * Do strict parsing in resolve() (see RFC 3986, section 5.2.2). Default
      * is true.
      */
-    const OPTION_STRICT           = 'strict';
+    const OPTION_STRICT = 'strict';
 
     /**
      * Represent arrays in query using PHP's [] notation. Default is true.
      */
-    const OPTION_USE_BRACKETS     = 'use_brackets';
+    const OPTION_USE_BRACKETS = 'use_brackets';
 
     /**
      * URL-encode query variable keys. Default is true.
      */
-    const OPTION_ENCODE_KEYS      = 'encode_keys';
+    const OPTION_ENCODE_KEYS = 'encode_keys';
 
     /**
      * Query variable separators when parsing the query string. Every character
      * is considered a separator. Default is specified by the
      * arg_separator.input php.ini setting (this defaults to "&").
      */
-    const OPTION_SEPARATOR_INPUT  = 'input_separator';
+    const OPTION_SEPARATOR_INPUT = 'input_separator';
 
     /**
      * Query variable separator used when generating the query string. Default
@@ -75,7 +89,7 @@ class Net_URL2
     /**
      * Default options corresponds to how PHP handles $_GET.
      */
-    private $options = array(
+    private $_options = array(
         self::OPTION_STRICT           => true,
         self::OPTION_USE_BRACKETS     => true,
         self::OPTION_ENCODE_KEYS      => true,
@@ -86,41 +100,43 @@ class Net_URL2
     /**
      * @var  string|bool
      */
-    private $scheme = false;
+    private $_scheme = false;
 
     /**
      * @var  string|bool
      */
-    private $userinfo = false;
+    private $_userinfo = false;
 
     /**
      * @var  string|bool
      */
-    private $host = false;
+    private $_host = false;
 
     /**
      * @var  int|bool
      */
-    private $port = false;
+    private $_port = false;
 
     /**
      * @var  string
      */
-    private $path = '';
+    private $_path = '';
 
     /**
      * @var  string|bool
      */
-    private $query = false;
+    private $_query = false;
 
     /**
      * @var  string|bool
      */
-    private $fragment = false;
+    private $_fragment = false;
 
     /**
+     * Constructor.
+     *
      * @param string $url     an absolute or relative URL
-     * @param array  $options
+     * @param array  $options an array of OPTION_xxx constants
      */
     public function __construct($url, $options = null)
     {
@@ -130,12 +146,12 @@ class Net_URL2
                          ini_get('arg_separator.output'));
         if (is_array($options)) {
             foreach ($options as $optionName => $value) {
-                $this->setOption($optionName);
+                $this->setOption($optionName, $value);
             }
         }
 
         if (preg_match('@^([a-z][a-z0-9.+-]*):@i', $url, $reg)) {
-            $this->scheme = $reg[1];
+            $this->_scheme = $reg[1];
             $url = substr($url, strlen($reg[0]));
         }
 
@@ -145,20 +161,59 @@ class Net_URL2
         }
 
         $i = strcspn($url, '?#');
-        $this->path = substr($url, 0, $i);
+        $this->_path = substr($url, 0, $i);
         $url = substr($url, $i);
 
         if (preg_match('@^\?([^#]*)@', $url, $reg)) {
-            $this->query = $reg[1];
+            $this->_query = $reg[1];
             $url = substr($url, strlen($reg[0]));
         }
 
         if ($url) {
-            $this->fragment = substr($url, 1);
+            $this->_fragment = substr($url, 1);
         }
     }
 
     /**
+     * Magic Setter.
+     *
+     * This method will magically set the value of a private variable ($var)
+     * with the value passed as the args
+     *
+     * @param  string $var      The private variable to set.
+     * @param  mixed  $arg      An argument of any type.
+     * @return void
+     */
+    public function __set($var, $arg)
+    {
+        $method = 'set' . $var;
+        if (method_exists($this, $method)) {
+            $this->$method($arg);
+        }
+    }
+    
+    /**
+     * Magic Getter.
+     *
+     * This is the magic get method to retrieve the private variable 
+     * that was set by either __set() or it's setter...
+     * 
+     * @param  string $var         The property name to retrieve.
+     * @return mixed  $this->$var  Either a boolean false if the
+     *                             property is not set or the value
+     *                             of the private property.
+     */
+    public function __get($var)
+    {
+        $method = 'get' . $var;
+        if (method_exists($this, $method)) {
+            return $this->$method();
+        }
+        
+        return false;
+    }
+    
+    /**
      * Returns the scheme, e.g. "http" or "urn", or false if there is no
      * scheme specified, i.e. if this is a relative URL.
      *
@@ -166,18 +221,23 @@ class Net_URL2
      */
     public function getScheme()
     {
-        return $this->scheme;
+        return $this->_scheme;
     }
 
     /**
-     * @param string|bool $scheme
+     * Sets the scheme, e.g. "http" or "urn". Specify false if there is no
+     * scheme specified, i.e. if this is a relative URL.
+     *
+     * @param string|bool $scheme e.g. "http" or "urn", or false if there is no
+     *                            scheme specified, i.e. if this is a relative
+     *                            URL
      *
      * @return void
      * @see    getScheme()
      */
     public function setScheme($scheme)
     {
-        $this->scheme = $scheme;
+        $this->_scheme = $scheme;
     }
 
     /**
@@ -188,7 +248,9 @@ class Net_URL2
      */
     public function getUser()
     {
-        return $this->userinfo !== false ? preg_replace('@:.*$@', '', $this->userinfo) : false;
+        return $this->_userinfo !== false
+            ? preg_replace('@:.*$@', '', $this->_userinfo)
+            : false;
     }
 
     /**
@@ -201,7 +263,9 @@ class Net_URL2
      */
     public function getPassword()
     {
-        return $this->userinfo !== false ? substr(strstr($this->userinfo, ':'), 1) : false;
+        return $this->_userinfo !== false
+            ? substr(strstr($this->_userinfo, ':'), 1)
+            : false;
     }
 
     /**
@@ -212,7 +276,7 @@ class Net_URL2
      */
     public function getUserinfo()
     {
-        return $this->userinfo;
+        return $this->_userinfo;
     }
 
     /**
@@ -220,15 +284,15 @@ class Net_URL2
      * in the userinfo part as username ":" password.
      *
      * @param string|bool $userinfo userinfo or username
-     * @param string|bool $password
+     * @param string|bool $password optional password, or false
      *
      * @return void
      */
     public function setUserinfo($userinfo, $password = false)
     {
-        $this->userinfo = $userinfo;
+        $this->_userinfo = $userinfo;
         if ($password !== false) {
-            $this->userinfo .= ':' . $password;
+            $this->_userinfo .= ':' . $password;
         }
     }
 
@@ -236,21 +300,24 @@ class Net_URL2
      * Returns the host part, or false if there is no authority part, e.g.
      * relative URLs.
      *
-     * @return  string|bool
+     * @return  string|bool a hostname, an IP address, or false
      */
     public function getHost()
     {
-        return $this->host;
+        return $this->_host;
     }
 
     /**
-     * @param string|bool $host
+     * Sets the host part. Specify false if there is no authority part, e.g.
+     * relative URLs.
+     *
+     * @param string|bool $host a hostname, an IP address, or false
      *
      * @return void
      */
     public function setHost($host)
     {
-        $this->host = $host;
+        $this->_host = $host;
     }
 
     /**
@@ -261,65 +328,72 @@ class Net_URL2
      */
     public function getPort()
     {
-        return $this->port;
+        return $this->_port;
     }
 
     /**
-     * @param int|bool $port
+     * Sets the port number. Specify false if there is no port number specified,
+     * i.e. if the default port is to be used.
+     *
+     * @param int|bool $port a port number, or false
      *
      * @return void
      */
     public function setPort($port)
     {
-        $this->port = intval($port);
+        $this->_port = intval($port);
     }
 
     /**
      * Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
-     * false if there is no authority none.
+     * false if there is no authority.
      *
      * @return string|bool
      */
     public function getAuthority()
     {
-        if (!$this->host) {
+        if (!$this->_host) {
             return false;
         }
 
         $authority = '';
 
-        if ($this->userinfo !== false) {
-            $authority .= $this->userinfo . '@';
+        if ($this->_userinfo !== false) {
+            $authority .= $this->_userinfo . '@';
         }
 
-        $authority .= $this->host;
+        $authority .= $this->_host;
 
-        if ($this->port !== false) {
-            $authority .= ':' . $this->port;
+        if ($this->_port !== false) {
+            $authority .= ':' . $this->_port;
         }
 
         return $authority;
     }
 
     /**
-     * @param string|false $authority
+     * Sets the authority part, i.e. [ userinfo "@" ] host [ ":" port ]. Specify
+     * false if there is no authority.
+     *
+     * @param string|false $authority a hostname or an IP addresse, possibly
+     *                                with userinfo prefixed and port number
+     *                                appended, e.g. "foo:bar@example.org:81".
      *
      * @return void
      */
     public function setAuthority($authority)
     {
-        $this->user = false;
-        $this->pass = false;
-        $this->host = false;
-        $this->port = false;
-        if (preg_match('@^(([^\@]+)\@)?([^:]+)(:(\d*))?$@', $authority, $reg)) {
+        $this->_userinfo = false;
+        $this->_host     = false;
+        $this->_port     = false;
+        if (preg_match('@^(([^\@]*)\@)?([^:]+)(:(\d*))?$@', $authority, $reg)) {
             if ($reg[1]) {
-                $this->userinfo = $reg[2];
+                $this->_userinfo = $reg[2];
             }
 
-            $this->host = $reg[3];
+            $this->_host = $reg[3];
             if (isset($reg[5])) {
-                $this->port = intval($reg[5]);
+                $this->_port = intval($reg[5]);
             }
         }
     }
@@ -331,65 +405,74 @@ class Net_URL2
      */
     public function getPath()
     {
-        return $this->path;
+        return $this->_path;
     }
 
     /**
-     * @param string $path
+     * Sets the path part (possibly an empty string).
+     *
+     * @param string $path a path
      *
      * @return void
      */
     public function setPath($path)
     {
-        $this->path = $path;
+        $this->_path = $path;
     }
 
     /**
      * Returns the query string (excluding the leading "?"), or false if "?"
-     * isn't present in the URL.
+     * is not present in the URL.
      *
      * @return  string|bool
      * @see     self::getQueryVariables()
      */
     public function getQuery()
     {
-        return $this->query;
+        return $this->_query;
     }
 
     /**
-     * @param string|bool $query
+     * Sets the query string (excluding the leading "?"). Specify false if "?"
+     * is not present in the URL.
+     *
+     * @param string|bool $query a query string, e.g. "foo=1&bar=2"
      *
      * @return void
      * @see   self::setQueryVariables()
      */
     public function setQuery($query)
     {
-        $this->query = $query;
+        $this->_query = $query;
     }
 
     /**
-     * Returns the fragment name, or false if "#" isn't present in the URL.
+     * Returns the fragment name, or false if "#" is not present in the URL.
      *
      * @return  string|bool
      */
     public function getFragment()
     {
-        return $this->fragment;
+        return $this->_fragment;
     }
 
     /**
-     * @param string|bool $fragment
+     * Sets the fragment name. Specify false if "#" is not present in the URL.
+     *
+     * @param string|bool $fragment a fragment excluding the leading "#", or
+     *                              false
      *
      * @return void
      */
     public function setFragment($fragment)
     {
-        $this->fragment = $fragment;
+        $this->_fragment = $fragment;
     }
 
     /**
      * Returns the query string like an array as the variables would appear in
-     * $_GET in a PHP script.
+     * $_GET in a PHP script. If the URL does not contain a "?", an empty array
+     * is returned.
      *
      * @return  array
      */
@@ -398,7 +481,7 @@ class Net_URL2
         $pattern = '/[' .
                    preg_quote($this->getOption(self::OPTION_SEPARATOR_INPUT), '/') .
                    ']/';
-        $parts   = preg_split($pattern, $this->query, -1, PREG_SPLIT_NO_EMPTY);
+        $parts   = preg_split($pattern, $this->_query, -1, PREG_SPLIT_NO_EMPTY);
         $return  = array();
 
         foreach ($parts as $part) {
@@ -445,6 +528,8 @@ class Net_URL2
     }
 
     /**
+     * Sets the query string to the specified variable in the query string.
+     *
      * @param array $array (name => value) array
      *
      * @return void
@@ -452,11 +537,11 @@ class Net_URL2
     public function setQueryVariables(array $array)
     {
         if (!$array) {
-            $this->query = false;
+            $this->_query = false;
         } else {
             foreach ($array as $name => $value) {
                 if ($this->getOption(self::OPTION_ENCODE_KEYS)) {
-                    $name = rawurlencode($name);
+                    $name = self::urlencode($name);
                 }
 
                 if (is_array($value)) {
@@ -466,19 +551,21 @@ class Net_URL2
                             : ($name . '=' . $v);
                     }
                 } elseif (!is_null($value)) {
-                    $parts[] = $name . '=' . $value;
+                    $parts[] = $name . '=' . self::urlencode($value);
                 } else {
                     $parts[] = $name;
                 }
             }
-            $this->query = implode($this->getOption(self::OPTION_SEPARATOR_OUTPUT),
-                                   $parts);
+            $this->_query = implode($this->getOption(self::OPTION_SEPARATOR_OUTPUT),
+                                    $parts);
         }
     }
 
     /**
-     * @param string $name
-     * @param mixed  $value
+     * Sets the specified variable in the query string.
+     *
+     * @param string $name  variable name
+     * @param mixed  $value variable value
      *
      * @return  array
      */
@@ -490,7 +577,9 @@ class Net_URL2
     }
 
     /**
-     * @param string $name
+     * Removes the specifed variable from the query string.
+     *
+     * @param string $name a query string variable, e.g. "foo" in "?foo=1"
      *
      * @return void
      */
@@ -511,27 +600,38 @@ class Net_URL2
         // See RFC 3986, section 5.3
         $url = "";
 
-        if ($this->scheme !== false) {
-            $url .= $this->scheme . ':';
+        if ($this->_scheme !== false) {
+            $url .= $this->_scheme . ':';
         }
 
         $authority = $this->getAuthority();
         if ($authority !== false) {
             $url .= '//' . $authority;
         }
-        $url .= $this->path;
+        $url .= $this->_path;
 
-        if ($this->query !== false) {
-            $url .= '?' . $this->query;
+        if ($this->_query !== false) {
+            $url .= '?' . $this->_query;
         }
 
-        if ($this->fragment !== false) {
-            $url .= '#' . $this->fragment;
+        if ($this->_fragment !== false) {
+            $url .= '#' . $this->_fragment;
         }
     
         return $url;
     }
 
+    /**
+     * Returns a string representation of this URL.
+     *
+     * @return  string
+     * @see toString()
+     */
+    public function __toString()
+    {
+        return $this->getURL();
+    }
+
     /** 
      * Returns a normalized string representation of this URL. This is useful
      * for comparison of URLs.
@@ -555,36 +655,38 @@ class Net_URL2
         // See RFC 3886, section 6
 
         // Schemes are case-insensitive
-        if ($this->scheme) {
-            $this->scheme = strtolower($this->scheme);
+        if ($this->_scheme) {
+            $this->_scheme = strtolower($this->_scheme);
         }
 
         // Hostnames are case-insensitive
-        if ($this->host) {
-            $this->host = strtolower($this->host);
+        if ($this->_host) {
+            $this->_host = strtolower($this->_host);
         }
 
         // Remove default port number for known schemes (RFC 3986, section 6.2.3)
-        if ($this->port &&
-            $this->scheme &&
-            $this->port == getservbyname($this->scheme, 'tcp')) {
+        if ($this->_port &&
+            $this->_scheme &&
+            $this->_port == getservbyname($this->_scheme, 'tcp')) {
 
-            $this->port = false;
+            $this->_port = false;
         }
 
         // Normalize case of %XX percentage-encodings (RFC 3986, section 6.2.2.1)
-        foreach (array('userinfo', 'host', 'path') as $part) {
+        foreach (array('_userinfo', '_host', '_path') as $part) {
             if ($this->$part) {
-                $this->$part  = preg_replace('/%[0-9a-f]{2}/ie', 'strtoupper("\0")', $this->$part);
+                $this->$part = preg_replace('/%[0-9a-f]{2}/ie',
+                                            'strtoupper("\0")',
+                                            $this->$part);
             }
         }
 
         // Path segment normalization (RFC 3986, section 6.2.2.3)
-        $this->path = self::removeDotSegments($this->path);
+        $this->_path = self::removeDotSegments($this->_path);
 
         // Scheme based normalization (RFC 3986, section 6.2.3)
-        if ($this->host && !$this->path) {
-            $this->path = '/';
+        if ($this->_host && !$this->_path) {
+            $this->_path = '/';
         }
     }
 
@@ -595,7 +697,7 @@ class Net_URL2
      */
     public function isAbsolute()
     {
-        return (bool) $this->scheme;
+        return (bool) $this->_scheme;
     }
 
     /**
@@ -608,7 +710,7 @@ class Net_URL2
      */
     public function resolve($reference)
     {
-        if (is_string($reference)) {
+        if (!$reference instanceof Net_URL2) {
             $reference = new self($reference);
         }
         if (!$this->isAbsolute()) {
@@ -617,54 +719,54 @@ class Net_URL2
 
         // A non-strict parser may ignore a scheme in the reference if it is
         // identical to the base URI's scheme.
-        if (!$this->getOption(self::OPTION_STRICT) && $reference->scheme == $this->scheme) {
-            $reference->scheme = false;
+        if (!$this->getOption(self::OPTION_STRICT) && $reference->_scheme == $this->_scheme) {
+            $reference->_scheme = false;
         }
 
         $target = new self('');
-        if ($reference->scheme !== false) {
-            $target->scheme = $reference->scheme;
+        if ($reference->_scheme !== false) {
+            $target->_scheme = $reference->_scheme;
             $target->setAuthority($reference->getAuthority());
-            $target->path  = self::removeDotSegments($reference->path);
-            $target->query = $reference->query;
+            $target->_path  = self::removeDotSegments($reference->_path);
+            $target->_query = $reference->_query;
         } else {
             $authority = $reference->getAuthority();
             if ($authority !== false) {
                 $target->setAuthority($authority);
-                $target->path  = self::removeDotSegments($reference->path);
-                $target->query = $reference->query;
+                $target->_path  = self::removeDotSegments($reference->_path);
+                $target->_query = $reference->_query;
             } else {
-                if ($reference->path == '') {
-                    $target->path = $this->path;
-                    if ($reference->query !== false) {
-                        $target->query = $reference->query;
+                if ($reference->_path == '') {
+                    $target->_path = $this->_path;
+                    if ($reference->_query !== false) {
+                        $target->_query = $reference->_query;
                     } else {
-                        $target->query = $this->query;
+                        $target->_query = $this->_query;
                     }
                 } else {
-                    if (substr($reference->path, 0, 1) == '/') {
-                        $target->path = self::removeDotSegments($reference->path);
+                    if (substr($reference->_path, 0, 1) == '/') {
+                        $target->_path = self::removeDotSegments($reference->_path);
                     } else {
                         // Merge paths (RFC 3986, section 5.2.3)
-                        if ($this->host !== false && $this->path == '') {
-                            $target->path = '/' . $this->path;
+                        if ($this->_host !== false && $this->_path == '') {
+                            $target->_path = '/' . $this->_path;
                         } else {
-                            $i = strrpos($this->path, '/');
+                            $i = strrpos($this->_path, '/');
                             if ($i !== false) {
-                                $target->path = substr($this->path, 0, $i + 1);
+                                $target->_path = substr($this->_path, 0, $i + 1);
                             }
-                            $target->path .= $reference->path;
+                            $target->_path .= $reference->_path;
                         }
-                        $target->path = self::removeDotSegments($target->path);
+                        $target->_path = self::removeDotSegments($target->_path);
                     }
-                    $target->query = $reference->query;
+                    $target->_query = $reference->_query;
                 }
                 $target->setAuthority($this->getAuthority());
             }
-            $target->scheme = $this->scheme;
+            $target->_scheme = $this->_scheme;
         }
 
-        $target->fragment = $reference->fragment;
+        $target->_fragment = $reference->_fragment;
 
         return $target;
     }
@@ -677,7 +779,7 @@ class Net_URL2
      *
      * @return string a path
      */
-    private static function removeDotSegments($path)
+    public static function removeDotSegments($path)
     {
         $output = '';
 
@@ -685,28 +787,25 @@ class Net_URL2
         // method
         $j = 0; 
         while ($path && $j++ < 100) {
-            // Step A
             if (substr($path, 0, 2) == './') {
+                // Step 2.A
                 $path = substr($path, 2);
             } elseif (substr($path, 0, 3) == '../') {
+                // Step 2.A
                 $path = substr($path, 3);
-
-            // Step B
             } elseif (substr($path, 0, 3) == '/./' || $path == '/.') {
+                // Step 2.B
                 $path = '/' . substr($path, 3);
-
-            // Step C
             } elseif (substr($path, 0, 4) == '/../' || $path == '/..') {
-                $path = '/' . substr($path, 4);
-                $i = strrpos($output, '/');
+                // Step 2.C
+                $path   = '/' . substr($path, 4);
+                $i      = strrpos($output, '/');
                 $output = $i === false ? '' : substr($output, 0, $i);
-
-            // Step D
             } elseif ($path == '.' || $path == '..') {
+                // Step 2.D
                 $path = '';
-
-            // Step E
             } else {
+                // Step 2.E
                 $i = strpos($path, '/');
                 if ($i === 0) {
                     $i = strpos($path, '/', 1);
@@ -723,6 +822,22 @@ class Net_URL2
     }
 
     /**
+     * Percent-encodes all non-alphanumeric characters except these: _ . - ~
+     * Similar to PHP's rawurlencode(), except that it also encodes ~ in PHP
+     * 5.2.x and earlier.
+     *
+     * @param  $raw the string to encode
+     * @return string
+     */
+    public static function urlencode($string)
+    {
+    	$encoded = rawurlencode($string);
+	// This is only necessary in PHP < 5.3.
+	$encoded = str_replace('%7E', '~', $encoded);
+	return $encoded;
+    }
+
+    /**
      * Returns a Net_URL2 instance representing the canonical URL of the
      * currently executing PHP script.
      * 
@@ -737,13 +852,13 @@ class Net_URL2
 
         // Begin with a relative URL
         $url = new self($_SERVER['PHP_SELF']);
-        $url->scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-        $url->host = $_SERVER['SERVER_NAME'];
+        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+        $url->_host   = $_SERVER['SERVER_NAME'];
         $port = intval($_SERVER['SERVER_PORT']);
-        if ($url->scheme == 'http' && $port != 80 ||
-            $url->scheme == 'https' && $port != 443) {
+        if ($url->_scheme == 'http' && $port != 80 ||
+            $url->_scheme == 'https' && $port != 443) {
 
-            $url->port = $port;
+            $url->_port = $port;
         }
         return $url;
     }
@@ -773,7 +888,7 @@ class Net_URL2
 
         // Begin with a relative URL
         $url = new self($_SERVER['REQUEST_URI']);
-        $url->scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
         // Set host and possibly port
         $url->setAuthority($_SERVER['HTTP_HOST']);
         return $url;
@@ -792,10 +907,10 @@ class Net_URL2
      */
     function setOption($optionName, $value)
     {
-        if (!array_key_exists($optionName, $this->options)) {
+        if (!array_key_exists($optionName, $this->_options)) {
             return false;
         }
-        $this->options[$optionName] = $value;
+        $this->_options[$optionName] = $value;
     }
 
     /**
@@ -807,7 +922,7 @@ class Net_URL2
      */
     function getOption($optionName)
     {
-        return isset($this->options[$optionName])
-            ? $this->options[$optionName] : false;
+        return isset($this->_options[$optionName])
+            ? $this->_options[$optionName] : false;
     }
 }
diff --git a/index.php b/index.php
index 3acdba375..b1e4f651e 100644
--- a/index.php
+++ b/index.php
@@ -68,6 +68,7 @@ function getPath($req)
  */
 function handleError($error)
 {
+//error_log(print_r($error,1));
     if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
         return;
     }
@@ -239,6 +240,7 @@ function main()
     if (!$user && common_config('site', 'private')
         && !isLoginAction($action)
         && !preg_match('/rss$/', $action)
+        && !preg_match('/^Api/', $action)
     ) {
         common_redirect(common_local_url('login'));
         return;
diff --git a/install.php b/install.php
index 6bfc4c2e2..e7f7cf318 100644
--- a/install.php
+++ b/install.php
@@ -94,6 +94,13 @@ $external_libraries=array(
         'check_class'=>'HTTP_Request'
     ),
     array(
+        'name'=>'HTTP_Request2',
+        'pear'=>'HTTP_Request2',
+        'url'=>'http://pear.php.net/package/HTTP_Request2',
+        'include'=>'HTTP/Request2.php',
+        'check_class'=>'HTTP_Request2'
+    ),
+    array(
         'name'=>'Mail',
         'pear'=>'Mail',
         'url'=>'http://pear.php.net/package/Mail',
@@ -124,6 +131,14 @@ $external_libraries=array(
         'check_class'=>'Net_URL_Mapper'
     ),
     array(
+        'name'=>'Net_LDAP2',
+        'pear'=>'Net_LDAP2',
+        'url'=>'http://pear.php.net/package/Net_LDAP2',
+        'deb'=>'php-net-ldap2',
+        'include'=>'Net/LDAP2.php',
+        'check_class'=>'Net_LDAP2'
+    ),
+    array(
         'name'=>'Net_Socket',
         'pear'=>'Net_Socket',
         'url'=>'http://pear.php.net/package/Net_Socket',
diff --git a/js/identica-badge.js b/js/identica-badge.js
index 49c42b70c..8276f22a1 100644
--- a/js/identica-badge.js
+++ b/js/identica-badge.js
@@ -1,8 +1,71 @@
 // identica badge -- updated to work with the native API, 12-4-2008
 // Modified to point to Identi.ca, 2-20-2009 by Zach
+// Modified for XHTML, 27-9-2009 by Will Daniels
+// (see http://willdaniels.co.uk/blog/tech-stuff/26-identica-badge-xhtml)
 // copyright Kent Brewster 2008
 // see http://kentbrewster.com/identica-badge for info
-( function() { 
+
+function createHTMLElement(tagName) {
+   if(document.createElementNS)
+      var elem = document.createElementNS("http://www.w3.org/1999/xhtml", tagName);
+   else
+      var elem = document.createElement(tagName);
+
+   return elem;
+}
+
+function isNumeric(value) {
+  if (value == null || !value.toString().match(/^[-]?\d*\.?\d*$/)) return false;
+  return true;
+}
+
+function markupPost(raw, server) {
+  var start = 0; var p = createHTMLElement('p');
+
+  raw.replace(/((http|https):\/\/|\!|@|#)(([\w_]+)?[^\s]*)/g,
+    function(sub, type, scheme, url, word, offset, full)
+    {
+      if(!scheme && !word) return; // just punctuation
+      var label = ''; var href = '';
+      var pretext = full.substr(start, offset - start);
+
+      moniker = word.split('_'); // behaviour with underscores differs
+      if(type == '#') moniker = moniker.join('');
+      else word = moniker = moniker[0].toLowerCase();
+
+      switch(type) {
+        case 'http://': case 'https://': // html links
+          href = scheme + '://' + url; break;
+        case '@': // link users
+          href = 'http://' + server + '/' + moniker; break;
+        case '!': // link groups
+          href = 'http://' + server + '/group/' + moniker; break;
+        case '#': // link tags
+          href = 'http://' + server + '/tag/' + moniker; break;
+        default: // bad call (just reset position for text)
+          start = offset;
+      }
+      if(scheme) { // only urls will have scheme
+        label = sub; start = offset + sub.length;
+      } else {
+        label = word; pretext += type;
+        start = offset + word.length + type.length;
+      }
+      p.appendChild(document.createTextNode(pretext));
+
+      var link = createHTMLElement('a');
+      link.appendChild(document.createTextNode(label));
+      link.href = href; link.target = '_statusnet';
+      p.appendChild(link);
+    });
+
+  if(start != raw.length) {
+    endtext = raw.substr(start);
+    p.appendChild(document.createTextNode(endtext));
+  }
+  return p;
+}
+(function() {
    var trueName = '';
    for (var i = 0; i < 16; i++) { 
       trueName += String.fromCharCode(Math.floor(Math.random() * 26) + 97); 
@@ -13,7 +76,7 @@
       return { 
          runFunction : [],
          init : function(target) {
-            var theScripts = document.getElementsByTagName('SCRIPT');
+            var theScripts = document.getElementsByTagName('script');
             for (var i = 0; i < theScripts.length; i++) {
                if (theScripts[i].src.match(target)) {
                   $.a = {};
@@ -66,9 +129,17 @@
                "server" : "identi.ca"
             };
             for (var k in $.d) { if ($.a[k] === undefined) { $.a[k] = $.d[k]; } }
+            // fix inout units
+            if(isNumeric($.a.width)) {
+               $.a.innerWidth = ($.a.width - 22) + 'px'; $.a.width += 'px';
+            } else {
+               $.a.innerWidth = 'auto';
+            }
+            if(isNumeric($.a.height)) $.a.height += 'px';
          },
-          buildPresentation : function () {
-            var ns = document.createElement('style');
+         buildPresentation : function () {
+            var setZoom = ''; if(navigator.appName == 'Microsoft Internet Explorer') setZoom = 'zoom:1;';
+            var ns = createHTMLElement('style');
             document.getElementsByTagName('head')[0].appendChild(ns);
             if (!window.createPopup) {
                ns.appendChild(document.createTextNode(''));
@@ -76,36 +147,37 @@
             }
             var s = document.styleSheets[document.styleSheets.length - 1];
             var rules = {
-               "" : "{zoom:1;margin:0;padding:0;width:" + $.a.width + "px;background:" + $.a.background + ";border:" + $.a.border + ";font:13px/1.2em tahoma, veranda, arial, helvetica, clean, sans-serif;*font-size:small;*font:x-small;}",
+               "" : "{margin:0px;padding:0px;width:" + $.a.width + ";background:" + $.a.background + ";border:" + $.a.border + ";font:87%/1.2em tahoma, veranda, arial, helvetica, clean, sans-serif;}",
                "a" : "{cursor:pointer;text-decoration:none;}",
                "a:hover" : "{text-decoration:underline;}",
-               "cite" : "{font-weight:bold;margin:0 0 0 4px;padding:0;display:block;font-style:normal;line-height:" + ($.a.thumbnailSize/2) + "px;}",
-               "cite a" : "{color:#C15D42;}",
-               "date":"{font-size:87%;margin:0 0 0 4px;padding:0;display:block;font-style:normal;line-height:" + ($.a.thumbnailSize/2) + "px;}",
-               "date:after" : "{clear:both; content:\".\"; display:block; height:0; visibility:hidden; }",
-               "date a" : "{color:#676;}",
-               "h3" : "{margin:0;padding:" + $.a.padding + "px;font-weight:bold;background:" + $.a.headerBackground + " url('http://" + $.a.server + "/favicon.ico') " + $.a.padding + "px 50% no-repeat;text-indent:" + ($.a.padding + 16) + "px;}",
+               ".cite" : "{" + setZoom + "font-weight:bold;margin:0px 0px 0px 4px;padding:0px;display:block;font-style:normal;line-height:" + ($.a.thumbnailSize/2) + "px;vertical-align:middle;}",
+               ".cite a" : "{color:#C15D42;}",
+               ".date":"{margin:0px 0px 0px 4px;padding:0px;display:block;font-style:normal;line-height:" + ($.a.thumbnailSize/2) + "px;vertical-align:middle;}",
+               ".date:after" : "{clear:both;content:\".\"; display:block;height:0px;visibility:hidden;}",
+               ".date a" : "{color:#676;}",
+               "h3" : "{margin:0px;padding:" + $.a.padding + "px;font-weight:bold;background:" + $.a.headerBackground + " url('http://" + $.a.server + "/favicon.ico') " + $.a.padding + "px 50% no-repeat;padding-left:" + ($.a.padding + 20) + "px;}",
                "h3.loading" : "{background-image:url('http://l.yimg.com/us.yimg.com/i/us/my/mw/anim_loading_sm.gif');}",
                "h3 a" : "{font-size:92%; color:" + $.a.headerColor + ";}",
-               "h4" : "{font-weight:normal; background:" + $.a.headerBackground + ";text-align:right;margin:0;padding:" + $.a.padding + "px;}",
+               "h4" : "{font-weight:normal;background:" + $.a.headerBackground + ";text-align:right;margin:0px;padding:" + $.a.padding + "px;}",
                "h4 a" : "{font-size:92%; color:" + $.a.headerColor + ";}",
-               "img":"{float:left; height:" + $.a.thumbnailSize + "px;width:" + $.a.thumbnailSize + "px;border:" + $.a.thumbnailBorder + ";margin-right:" + $.a.padding + "px;}",
-               "p" : "{margin:0; padding:0;width:" + ($.a.width - 22) + "px;overflow:hidden;font-size:87%;}",
+               "img":"{float:left;height:" + $.a.thumbnailSize + "px;width:" + $.a.thumbnailSize + "px;border:" + $.a.thumbnailBorder + ";margin-right:" + $.a.padding + "px;}",
+               "p" : "{margin:2px 0px 0px 0px;padding:0px;width:" + $.a.innerWidth + ";overflow:hidden;line-height:normal;}",
                "p a" : "{color:#C15D42;}",
-               "ul":"{margin:0; padding:0; height:" + $.a.height + "px;width:" + $.a.width + "px;overflow:auto;}",
-               "ul li":"{background:" + $.a.evenBackground + ";margin:0;padding:" + $.a.padding + "px;list-style:none;width:" + ($.a.width - 22) + "px;overflow:hidden;border-bottom:1px solid #D8E2D7;}",
+               "ul":"{margin:0px; padding:0px; height:" + $.a.height + ";width:" + $.a.innerWidth + ";overflow:auto;}",
+               "ul li":"{background:" + $.a.evenBackground + ";margin:0px;padding:" + $.a.padding + "px;list-style:none;width:auto;overflow:hidden;border-bottom:1px solid #D8E2D7;}",
                "ul li:hover":"{background:#f3f8ea;}"
             };
             var ieRules = "";
             // brute-force each and every style rule here to !important
             // sometimes you have to take off and nuke the site from orbit; it's the only way to be sure
             for (var z in rules) {
-               var selector = '.' + trueName + ' ' + z;
+               if(z.charAt(0)=='.') var selector = '.' + trueName + '-' + z.substring(1);
+               else var selector = '.' + trueName + ' ' + z;
                var rule = rules[z];
                if (typeof rule === 'string') {
                   var important = rule.replace(/;/gi, '!important;');
                   if (!window.createPopup) {
-                     var theRule = document.createTextNode(selector + important);
+                     var theRule = document.createTextNode(selector + important + '\n');
                      ns.appendChild(theRule);
                   } else {
                      ieRules += selector + important;
@@ -115,17 +187,17 @@
             if (window.createPopup) { s.cssText = ieRules; }
          },
          buildStructure : function() {
-            $.s = document.createElement('DIV');
+            $.s = createHTMLElement('div');
             $.s.className = trueName;         
-            $.s.h = document.createElement('H3');
-            $.s.h.a = document.createElement('A');
+            $.s.h = createHTMLElement('h3');
+            $.s.h.a = createHTMLElement('a');
             $.s.h.a.target = '_statusnet';
             $.s.h.appendChild($.s.h.a);
             $.s.appendChild($.s.h);
-            $.s.r = document.createElement('UL');
+            $.s.r = createHTMLElement('ul');
             $.s.appendChild($.s.r);
-            $.s.f = document.createElement('H4');
-            var a = document.createElement('A');
+            $.s.f = createHTMLElement('h4');
+            var a = createHTMLElement('a');
             a.innerHTML = 'get this';
             a.target = '_blank';
             a.href = 'http://identi.ca/doc/badge';
@@ -139,7 +211,7 @@
             var id = trueName + '.f.runFunction[' + n + ']';
             $.f.runFunction[n] = function(r) {
                delete($.f.runFunction[n]);
-               var a = document.createElement('A');
+               var a = createHTMLElement('a');
                a.rel = $.a.user;
                a.rev = r.name; 
                a.id = r.screen_name;
@@ -178,10 +250,11 @@
                }
             }
             r = $.f.sortArray(r, "status_id", true);
-            $.s.h.className = '';
+            $.s.h.className = ''; // for IE6
+            $.s.h.removeAttribute('class');
             for (var i = 0; i < r.length; i++) {
-               var li = document.createElement('LI');
-               var icon = document.createElement('A');
+               var li = createHTMLElement('li');
+               var icon = createHTMLElement('a');
                if (r[i] && r[i].url) {
                   icon.href = r[i].url;
                   icon.target = '_statusnet'; 
@@ -192,17 +265,19 @@
                   icon.title = 'Visit ' + r[i].screen_name + ' at http://' + $.a.server + '/' + r[i].screen_name;
                }
 
-               var img = document.createElement('IMG');
+               var img = createHTMLElement('img');
+               img.alt = 'profile image for ' + r[i].screen_name;
                img.src = r[i].profile_image_url;
                icon.appendChild(img);
-               li.appendChild(icon); 
+               li.appendChild(icon);
                
-               var user = document.createElement('CITE');
-               var a = document.createElement('A');
+               var user = createHTMLElement('span');
+               user.className = trueName + '-cite';
+               var a = createHTMLElement('a');
                a.rel = r[i].id;
                a.rev = r[i].name;
                a.id = r[i].screen_name;
-               a.innerHTML = r[i].name; 
+               a.innerHTML = r[i].name;
                a.href = 'http://' + $.a.server + '/' + r[i].screen_name;
                a.onclick = function() {
                   $.f.changeUserTo(this);
@@ -210,16 +285,17 @@
                };
                user.appendChild(a);
                li.appendChild(user);
-               var updated = document.createElement('DATE');
+               var updated = createHTMLElement('span');
+               updated.className = trueName + '-date';
                if (r[i].status && r[i].status.created_at) {
-                  var date_link = document.createElement('A');
+                  var date_link = createHTMLElement('a');
                   date_link.innerHTML = r[i].status.created_at.split(/\+/)[0];
                   date_link.href = 'http://' + $.a.server + '/notice/' + r[i].status.id;
                   date_link.target = '_statusnet';
                   updated.appendChild(date_link);
                   if (r[i].status.in_reply_to_status_id) {
                      updated.appendChild(document.createTextNode(' in reply to '));
-                     var in_reply_to = document.createElement('A');
+                     var in_reply_to = createHTMLElement('a');
                      in_reply_to.innerHTML = r[i].status.in_reply_to_status_id;
                      in_reply_to.href = 'http://' + $.a.server + '/notice/' + r[i].status.in_reply_to_status_id;
                      in_reply_to.target = '_statusnet';
@@ -229,20 +305,16 @@
                   updated.innerHTML = 'has not updated yet';
                }
                li.appendChild(updated);
-               var p = document.createElement('P');
+               var p = createHTMLElement('p');
                if (r[i].status && r[i].status.text) {
                   var raw = r[i].status.text;
-                  var cooked = raw;
-                  cooked = cooked.replace(/http:\/\/([^ ]+)/g, "<a href=\"http://$1\" target=\"_statusnet\">http://$1</a>");
-                  cooked = cooked.replace(/@([\w*]+)/g, '@<a href="http://' + $.a.server + '/$1" target=\"_statusnet\">$1</a>');
-                  cooked = cooked.replace(/#([\w*]+)/g, '#<a href="http://' + $.a.server + '/tag/$1" target="_statusnet">$1</a>');
-                  p.innerHTML = cooked;
+                  p = markupPost(raw, $.a.server);
                }
                li.appendChild(p);
-               var a = p.getElementsByTagName('A');
+               var a = p.getElementsByTagName('a');
                for (var j = 0; j < a.length; j++) {
                   if (a[j].className == 'changeUserTo') {
-                     a[j].className = '';
+                     a[j].removeAttribute('class');
                      a[j].href = 'http://' + $.a.server + '/' + a[j].innerHTML;
                      a[j].rel = a[j].innerHTML;
                      a[j].onclick = function() { 
@@ -269,7 +341,7 @@
             return r;
          },         
          runScript : function(url, id) {
-            var s = document.createElement('script');
+            var s = createHTMLElement('script');
             s.id = id;
             s.type ='text/javascript';
             s.src = url;
@@ -292,3 +364,4 @@
    }
 } )();
 
+
diff --git a/js/util.js b/js/util.js
index 663ec8986..b90f33ec7 100644
--- a/js/util.js
+++ b/js/util.js
@@ -24,29 +24,6 @@
  * @link      http://status.net/
  */
 
-$(document).ready(function(){
-    if ($('body.user_in').length > 0) {
-        $('.'+SN.C.S.FormNotice).each(function() { SN.U.FormNoticeEnhancements($(this)); });
-
-        $('.form_user_subscribe').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_user_unsubscribe').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_favor').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_group_join').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_group_leave').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); });
-
-        SN.U.NoticeReply();
-
-        SN.U.NoticeDataAttach();
-
-        SN.U.NewDirectMessage();
-    }
-
-    SN.U.NoticeAttachments();
-});
-
-
 var SN = { // StatusNet
     C: { // Config
         I: { // Init
@@ -76,6 +53,8 @@ var SN = { // StatusNet
     U: { // Utils
         FormNoticeEnhancements: function(form) {
             form_id = form.attr('id');
+            $('#'+form_id+' #'+SN.C.S.NoticeDataText).unbind('keyup');
+            $('#'+form_id+' #'+SN.C.S.NoticeDataText).unbind('keydown');
             if (maxLength > 0) {
                 $('#'+form_id+' #'+SN.C.S.NoticeDataText).bind('keyup', function(e) {
                     SN.U.Counter(form);
@@ -91,8 +70,6 @@ var SN = { // StatusNet
             if($('body')[0].id != 'conversation') {
                 $('#'+form_id+' textarea').focus();
             }
-
-            SN.U.FormNoticeXHR(form);
         },
 
         SubmitOnReturn: function(event, el) {
@@ -100,7 +77,7 @@ var SN = { // StatusNet
                 el.submit();
                 event.preventDefault();
                 event.stopPropagation();
-                $('#'+el[0].id+' #'+SN.U.NoticeDataText).blur();
+                $('#'+el[0].id+' #'+SN.C.S.NoticeDataText).blur();
                 $('body').focus();
                 return false;
             }
@@ -122,7 +99,7 @@ var SN = { // StatusNet
             var counter = $('#'+form_id+' #'+SN.C.S.NoticeTextCount);
 
             if (remaining.toString() != counter.text()) {
-                if (!SN.C.I.CounterBlackout || remaining == 0) {
+                if (!SN.C.I.CounterBlackout || remaining === 0) {
                     if (counter.text() != String(remaining)) {
                         counter.text(remaining);
                     }
@@ -213,14 +190,15 @@ var SN = { // StatusNet
                             }
                             else {
                                 $('#'+form_id+' #'+SN.C.S.NoticeDataText).val('');
-                                SN.U.Counter($('#'+SN.C.S.FormNotice));
+                                SN.U.FormNoticeEnhancements($('#'+form_id));
                             }
                         }
                     }
                 },
                 success: function(data, textStatus) {
+                    var result;
                     if ($('#'+SN.C.S.Error, data).length > 0) {
-                        var result = document._importNode($('p', data)[0], true);
+                        result = document._importNode($('p', data)[0], true);
                         alert(result.textContent || result.innerHTML);
                     }
                     else {
@@ -229,12 +207,12 @@ var SN = { // StatusNet
                         }
 
                         if ($('#'+SN.C.S.CommandResult, data).length > 0) {
-                            var result = document._importNode($('p', data)[0], true);
+                            result = document._importNode($('p', data)[0], true);
                             alert(result.textContent || result.innerHTML);
                         }
                         else {
                              notice = document._importNode($('li', data)[0], true);
-                             if ($('#'+notice.id).length == 0) {
+                             if ($('#'+notice.id).length === 0) {
                                 var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val();
                                 var notice_irt = '#notices_primary #notice-'+notice_irt_value;
                                 if($('body')[0].id == 'conversation') {
@@ -256,7 +234,7 @@ var SN = { // StatusNet
                         $('#'+form_id+' #'+SN.C.S.NoticeDataAttach).val('');
                         $('#'+form_id+' #'+SN.C.S.NoticeInReplyTo).val('');
                         $('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove();
-                        SN.U.Counter($('#'+SN.C.S.FormNotice));
+                        SN.U.FormNoticeEnhancements($('#'+form_id));
                     }
                 },
                 complete: function(xhr, textStatus) {
@@ -287,10 +265,10 @@ var SN = { // StatusNet
                     replyto = '@' + nick + ' ';
                     text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
                     $('#'+SN.C.S.FormNotice+' input#'+SN.C.S.NoticeInReplyTo).val(id);
-                    if (text.get(0).setSelectionRange) {
+                    if (text[0].setSelectionRange) {
                         var len = text.val().length;
-                        text.get(0).setSelectionRange(len,len);
-                        text.get(0).focus();
+                        text[0].setSelectionRange(len,len);
+                        text[0].focus();
                     }
                     return false;
                 }
@@ -310,7 +288,7 @@ var SN = { // StatusNet
                 imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
                 bgClickToClose : true,
                 success : function() {
-                    $('#jOverlayContent').append('<button>&#215;</button>');
+                    $('#jOverlayContent').append('<button class="close">&#215;</button>');
                     $('#jOverlayContent button').click($.closeOverlay);
                 },
                 timeout : 0,
@@ -330,7 +308,7 @@ var SN = { // StatusNet
                     $("a.thumbnail").children('img').hide();
                     anchor.closest(".entry-title").addClass('ov');
 
-                    if (anchor.children('img').length == 0) {
+                    if (anchor.children('img').length === 0) {
                         t = setTimeout(function() {
                             $.get($('address .url')[0].href+'attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
                                 anchor.append(data);
@@ -352,9 +330,14 @@ var SN = { // StatusNet
         NoticeDataAttach: function() {
             NDA = $('#'+SN.C.S.NoticeDataAttach);
             NDA.change(function() {
-                S = '<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+$(this).val()+'</code> <button>&#215;</button></div>';
+                S = '<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+$(this).val()+'</code> <button class="close">&#215;</button></div>';
                 NDAS = $('#'+SN.C.S.NoticeDataAttachSelected);
-                (NDAS.length > 0) ? NDAS.replaceWith(S) : $('#'+SN.C.S.FormNotice).append(S);
+                if (NDAS.length > 0) {
+                    NDAS.replaceWith(S);
+                }
+                else {
+                    $('#'+SN.C.S.FormNotice).append(S);
+                }
                 $('#'+SN.C.S.NoticeDataAttachSelected+' button').click(function(){
                     $('#'+SN.C.S.NoticeDataAttachSelected).remove();
                     NDA.val('');
@@ -367,12 +350,13 @@ var SN = { // StatusNet
             NDM.attr({'href':NDM.attr('href')+'&ajax=1'});
             NDM.click(function() {
                 var NDMF = $('.entity_send-a-message form');
-                if (NDMF.length == 0) {
+                if (NDMF.length === 0) {
                     $.get(NDM.attr('href'), null, function(data) {
-                        $('.entity_send-a-message').append(document._importNode($('form', data).get(0), true));
+                        $('.entity_send-a-message').append(document._importNode($('form', data)[0], true));
                         NDMF = $('.entity_send-a-message .form_notice');
+                        SN.U.FormNoticeXHR(NDMF);
                         SN.U.FormNoticeEnhancements(NDMF);
-                        NDMF.append('<button>&#215;</button>');
+                        NDMF.append('<button class="close">&#215;</button>');
                         $('.entity_send-a-message button').click(function(){
                             NDMF.hide();
                             return false;
@@ -387,4 +371,30 @@ var SN = { // StatusNet
             });
         }
     }
-}
+};
+
+$(document).ready(function(){
+    if ($('body.user_in').length > 0) {
+        $('.'+SN.C.S.FormNotice).each(function() {
+            SN.U.FormNoticeXHR($(this));
+            SN.U.FormNoticeEnhancements($(this));
+        });
+
+        $('.form_user_subscribe').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_user_unsubscribe').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_favor').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_group_join').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_group_leave').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); });
+
+        SN.U.NoticeReply();
+
+        SN.U.NoticeDataAttach();
+
+        SN.U.NewDirectMessage();
+    }
+
+    SN.U.NoticeAttachments();
+});
+
diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index 18ae7719b..de4d55012 100644
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -41,22 +41,18 @@ abstract class ShortUrlApi
         return strlen($url) >= common_config('site', 'shorturllength');
     }
 
-    protected function http_post($data) {
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->service_url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-        $response = curl_exec($ch);
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
-        if (($code < 200) || ($code >= 400)) return false;
-        return $response;
+    protected function http_post($data)
+    {
+        $request = HTTPClient::start();
+        $response = $request->post($this->service_url, null, $data);
+        return $response->getBody();
     }
 
-    protected function http_get($url) {
-        $encoded_url = urlencode($url);
-        return file_get_contents("{$this->service_url}$encoded_url");
+    protected function http_get($url)
+    {
+        $request = HTTPClient::start();
+        $response = $request->get($this->service_url . urlencode($url));
+        return $response->getBody();
     }
 
     protected function tidy($response) {
diff --git a/lib/api.php b/lib/api.php
index 9bd2083de..a1236ab7e 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -134,11 +134,20 @@ class ApiAction extends Action
         $twitter_user['protected'] = false; # not supported by StatusNet yet
         $twitter_user['followers_count'] = $profile->subscriberCount();
 
-        // Need to pull up the user for some of this
-        $user = $profile->getUser();
-        $design = $user->getDesign();
         $defaultDesign = Design::siteDesign();
-        if (!$design) $design = $defaultDesign;
+        $design        = null;
+        $user          = $profile->getUser();
+
+        // Note: some profiles don't have an associated user
+
+        if (!empty($user)) {
+            $design = $user->getDesign();
+        }
+
+        if (empty($design)) {
+            $design = $defaultDesign;
+        }
+
         $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor);
         $twitter_user['profile_background_color'] = ($color == null) ? '' : '#'.$color->hexValue();
         $color = Design::toWebColor(empty($design->textcolor) ? $defaultDesign->textcolor : $design->textcolor);
diff --git a/lib/apiprivateauth.php b/lib/apiprivateauth.php
new file mode 100644
index 000000000..5d0033005
--- /dev/null
+++ b/lib/apiprivateauth.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Base class for API actions that only require auth when a site
+ * is configured to be private
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Adrian Lang <mail@adrianlang.de>
+ * @author    Brenda Wallace <shiny@cpan.org>
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    mEDI <medi@milaro.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @author    Zach Copley <zach@status.net> 
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apiauth.php';
+
+/**
+ * Actions extending this class will require auth only if a site is private
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Adrian Lang <mail@adrianlang.de>
+ * @author   Brenda Wallace <shiny@cpan.org>
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   mEDI <medi@milaro.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiPrivateAuthAction extends ApiAuthAction
+{
+
+   /**
+     * Does this API resource require authentication?
+     *
+     * @return boolean true or false
+     */
+
+    function requiresAuth()
+    {
+        // If the site is "private", all API methods except statusnet/config
+        // need authentication
+
+        if (common_config('site', 'private')) {
+            return true;
+        }
+
+        return false;
+    }
+
+}
diff --git a/lib/command.php b/lib/command.php
index 9efa40696..2ec3320de 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -579,6 +579,32 @@ class OnCommand extends Command
     }
 }
 
+class LoginCommand extends Command
+{
+    function execute($channel)
+    {
+        $login_token = Login_token::staticGet('user_id',$this->user->id);
+        if($login_token){
+            $login_token->delete();
+        }
+        $login_token = new Login_token();
+        $login_token->user_id = $this->user->id;
+        $login_token->token = common_good_rand(16);
+        $login_token->created = common_sql_now();
+        $result = $login_token->insert();
+        if (!$result) {
+          common_log_db_error($login_token, 'INSERT', __FILE__);
+          $channel->error($this->user, sprintf(_('Could not create login token for %s'),
+                                       $this->user->nickname));
+          return;
+        }
+        $channel->output($this->user,
+            sprintf(_('This link is useable only once, and is good for only 2 minutes: %s'),
+                    common_local_url('login',
+                        array('user_id'=>$login_token->user_id, 'token'=>$login_token->token))));
+    }
+}
+
 class HelpCommand extends Command
 {
     function execute($channel)
@@ -598,6 +624,7 @@ class HelpCommand extends Command
                            "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".
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index b921a17cc..d878fe268 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -41,6 +41,12 @@ class CommandInterpreter
                 return null;
             }
             return new HelpCommand($user);
+         case 'login':
+            if ($arg) {
+                return null;
+            } else {
+                return new LoginCommand($user);
+            }
          case 'on':
             if ($arg) {
                 list($other, $extra) = $this->split_arg($arg);
diff --git a/lib/common.php b/lib/common.php
index 2c2f6869e..68bdbf229 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -169,6 +169,7 @@ if (isset($conffile)) {
     $_config_files[] = INSTALLDIR.'/config.php';
 }
 
+global $_have_a_config;
 $_have_a_config = false;
 
 foreach ($_config_files as $_config_file) {
@@ -187,7 +188,7 @@ function _have_config()
 // XXX: Throw a conniption if database not installed
 // XXX: Find a way to use htmlwriter for this instead of handcoded markup
 if (!_have_config()) {
-  echo '<p>'. _('No configuation file found. ') .'</p>';
+  echo '<p>'. _('No configuration file found. ') .'</p>';
   echo '<p>'. _('I looked for configuration files in the following places: ') .'<br/> '. implode($_config_files, '<br/>');
   echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>';
   echo '<a href="install.php">'. _('Go to the installer.') .'</a>';
diff --git a/lib/curlclient.php b/lib/curlclient.php
deleted file mode 100644
index c307c2984..000000000
--- a/lib/curlclient.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Utility class for wrapping Curl
- *
- * 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  HTTP
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-define(CURLCLIENT_VERSION, "0.1");
-
-/**
- * Wrapper for Curl
- *
- * Makes Curl HTTP client calls within our HTTPClient framework
- *
- * @category HTTP
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- */
-
-class CurlClient extends HTTPClient
-{
-    function __construct()
-    {
-    }
-
-    function head($url, $headers=null)
-    {
-        $ch = curl_init($url);
-
-        $this->setup($ch);
-
-        curl_setopt_array($ch,
-                          array(CURLOPT_NOBODY => true));
-
-        if (!is_null($headers)) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        }
-
-        $result = curl_exec($ch);
-
-        curl_close($ch);
-
-        return $this->parseResults($result);
-    }
-
-    function get($url, $headers=null)
-    {
-        $ch = curl_init($url);
-
-        $this->setup($ch);
-
-        if (!is_null($headers)) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        }
-
-        $result = curl_exec($ch);
-
-        curl_close($ch);
-
-        return $this->parseResults($result);
-    }
-
-    function post($url, $headers=null, $body=null)
-    {
-        $ch = curl_init($url);
-
-        $this->setup($ch);
-
-        curl_setopt($ch, CURLOPT_POST, true);
-
-        if (!is_null($body)) {
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
-        }
-
-        if (!is_null($headers)) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        }
-
-        $result = curl_exec($ch);
-
-        curl_close($ch);
-
-        return $this->parseResults($result);
-    }
-
-    function setup($ch)
-    {
-        curl_setopt_array($ch,
-                          array(CURLOPT_USERAGENT => $this->userAgent(),
-                                CURLOPT_HEADER => true,
-                                CURLOPT_RETURNTRANSFER => true));
-    }
-
-    function userAgent()
-    {
-        $version = curl_version();
-        return parent::userAgent() . " CurlClient/".CURLCLIENT_VERSION . " cURL/" . $version['version'];
-    }
-
-    function parseResults($results)
-    {
-        $resp = new HTTPResponse();
-
-        $lines = explode("\r\n", $results);
-
-        if (preg_match("#^HTTP/1.[01] (\d\d\d) .+$#", $lines[0], $match)) {
-            $resp->code = $match[1];
-        } else {
-            throw Exception("Bad format: initial line is not HTTP status line");
-        }
-
-        $lastk = null;
-
-        for ($i = 1; $i < count($lines); $i++) {
-            $l =& $lines[$i];
-            if (mb_strlen($l) == 0) {
-                $resp->body = implode("\r\n", array_slice($lines, $i + 1));
-                break;
-            }
-            if (preg_match("#^(\S+):\s+(.*)$#", $l, $match)) {
-                $k = $match[1];
-                $v = $match[2];
-
-                if (array_key_exists($k, $resp->headers)) {
-                    if (is_array($resp->headers[$k])) {
-                        $resp->headers[$k][] = $v;
-                    } else {
-                        $resp->headers[$k] = array($resp->headers[$k], $v);
-                    }
-                } else {
-                    $resp->headers[$k] = $v;
-                }
-                $lastk = $k;
-            } else if (preg_match("#^\s+(.*)$#", $l, $match)) {
-                // continuation line
-                if (is_null($lastk)) {
-                    throw Exception("Bad format: initial whitespace in headers");
-                }
-                $h =& $resp->headers[$lastk];
-                if (is_array($h)) {
-                    $n = count($h);
-                    $h[$n-1] .= $match[1];
-                } else {
-                    $h .= $match[1];
-                }
-            }
-        }
-
-        return $resp;
-    }
-}
diff --git a/lib/default.php b/lib/default.php
index 7ec8558b0..f6cc4b725 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -228,8 +228,6 @@ $default =
         array('contentlimit' => null),
         'message' =>
         array('contentlimit' => null),
-        'http' =>
-        array('client' => 'curl'), // XXX: should this be the default?
         'location' =>
         array('namespace' => 1), // 1 = geonames, 2 = Yahoo Where on Earth
         );
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 820d534f2..5ce9ddeda 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -271,17 +271,20 @@ class DesignSettingsAction extends AccountSettingsAction
 
     function handlePost()
     {
-        // XXX: Robin's workaround for a bug in PHP where $_POST
-        // and $_FILE are empty in the case that the uploaded
-        // file is bigger than PHP is configured to handle.
-
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            if (empty($_POST) && $_SERVER['CONTENT_LENGTH']) {
 
+            // Workaround for PHP returning empty $_POST and $_FILES when POST
+            // length > post_max_size in php.ini
+
+            if (empty($_FILES)
+                && empty($_POST)
+                && ($_SERVER['CONTENT_LENGTH'] > 0)
+            ) {
                 $msg = _('The server was unable to handle that much POST ' .
                     'data (%s bytes) due to its current configuration.');
 
                 $this->showForm(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
+                return;
             }
         }
 
diff --git a/lib/error.php b/lib/error.php
index 6a9b76be1..3162cfe65 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -70,7 +70,7 @@ class ErrorAction extends Action
      */
     function extraHeaders()
     {
-        $status_string = $this->status[$this->code];
+        $status_string = @self::$status[$this->code];
         header('HTTP/1.1 '.$this->code.' '.$status_string);
     }
 
@@ -92,7 +92,7 @@ class ErrorAction extends Action
 
     function title()
     {
-        return self::$status[$this->code];
+        return @self::$status[$this->code];
     }
 
     function isReadOnly($args)
diff --git a/lib/grouplist.php b/lib/grouplist.php
index b41c5b5f8..cc734bdd0 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -97,7 +97,7 @@ class GroupList extends Widget
 
         $this->out->elementStart('a', array('href' => $this->group->homeUrl(),
                                             'class' => 'url',
-                                            'rel' => 'group'));
+                                            'rel' => 'contact group'));
         $this->out->element('img', array('src' => $logo,
                                          'class' => 'photo avatar',
                                          'width' => AVATAR_STREAM_SIZE,
@@ -105,48 +105,32 @@ class GroupList extends Widget
                                          'alt' =>
                                          ($this->group->fullname) ? $this->group->fullname :
                                          $this->group->nickname));
-        $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn org nickname url uid';
+        $hasFN = ($this->group->fullname) ? 'nickname' : 'fn org nickname';
         $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->group->nickname));
         $this->out->elementEnd('span');
         $this->out->elementEnd('a');
 
         if ($this->group->fullname) {
-            $this->out->elementStart('dl', 'entity_fn');
-            $this->out->element('dt', null, 'Full name');
-            $this->out->elementStart('dd');
             $this->out->elementStart('span', 'fn org');
             $this->out->raw($this->highlight($this->group->fullname));
             $this->out->elementEnd('span');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
         if ($this->group->location) {
-            $this->out->elementStart('dl', 'entity_location');
-            $this->out->element('dt', null, _('Location'));
-            $this->out->elementStart('dd', 'label');
+            $this->out->elementStart('span', 'label');
             $this->out->raw($this->highlight($this->group->location));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
+            $this->out->elementEnd('span');
         }
         if ($this->group->homepage) {
-            $this->out->elementStart('dl', 'entity_url');
-            $this->out->element('dt', null, _('URL'));
-            $this->out->elementStart('dd');
             $this->out->elementStart('a', array('href' => $this->group->homepage,
                                                 'class' => 'url'));
             $this->out->raw($this->highlight($this->group->homepage));
             $this->out->elementEnd('a');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
         if ($this->group->description) {
-            $this->out->elementStart('dl', 'entity_note');
-            $this->out->element('dt', null, _('Note'));
-            $this->out->elementStart('dd', 'note');
+            $this->out->elementStart('p', 'note');
             $this->out->raw($this->highlight($this->group->description));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
+            $this->out->elementEnd('p');
         }
 
         # If we're on a list with an owner (subscriptions or subscribers)...
diff --git a/lib/httpclient.php b/lib/httpclient.php
index f16e31e10..3f8262076 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -31,6 +31,9 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+require_once 'HTTP/Request2.php';
+require_once 'HTTP/Request2/Response.php';
+
 /**
  * Useful structure for HTTP responses
  *
@@ -38,18 +41,53 @@ if (!defined('STATUSNET')) {
  * ways of doing them. This class hides the specifics of what underlying
  * library (curl or PHP-HTTP or whatever) that's used.
  *
+ * This extends the HTTP_Request2_Response class with methods to get info
+ * about any followed redirects.
+ *
  * @category HTTP
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @author Brion Vibber <brion@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
  */
-
-class HTTPResponse
+class HTTPResponse extends HTTP_Request2_Response
 {
-    public $code = null;
-    public $headers = array();
-    public $body = null;
+    function __construct(HTTP_Request2_Response $response, $url, $redirects=0)
+    {
+        foreach (get_object_vars($response) as $key => $val) {
+            $this->$key = $val;
+        }
+        $this->url = strval($url);
+        $this->redirectCount = intval($redirects);
+    }
+
+    /**
+     * Get the count of redirects that have been followed, if any.
+     * @return int
+     */
+    function getRedirectCount()
+    {
+        return $this->redirectCount;
+    }
+
+    /**
+     * Gets the final target URL, after any redirects have been followed.
+     * @return string URL
+     */
+    function getUrl()
+    {
+        return $this->url;
+    }
+
+    /**
+     * Check if the response is OK, generally a 200 status code.
+     * @return bool
+     */
+    function isOk()
+    {
+        return ($this->getStatus() == 200);
+    }
 }
 
 /**
@@ -59,64 +97,163 @@ class HTTPResponse
  * ways of doing them. This class hides the specifics of what underlying
  * library (curl or PHP-HTTP or whatever) that's used.
  *
+ * This extends the PEAR HTTP_Request2 package:
+ * - sends StatusNet-specific User-Agent header
+ * - 'follow_redirects' config option, defaulting off
+ * - 'max_redirs' config option, defaulting to 10
+ * - extended response class adds getRedirectCount() and getUrl() methods
+ * - get() and post() convenience functions return body content directly
+ *
  * @category HTTP
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
+ * @author   Brion Vibber <brion@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
 
-class HTTPClient
+class HTTPClient extends HTTP_Request2
 {
-    static $_client = null;
 
-    static function start()
+    function __construct($url=null, $method=self::METHOD_GET, $config=array())
     {
-        if (!is_null(self::$_client)) {
-            return self::$_client;
-        }
-
-        $type = common_config('http', 'client');
-
-        switch ($type) {
-         case 'curl':
-            self::$_client = new CurlClient();
-            break;
-         default:
-            throw new Exception("Unknown HTTP client type '$type'");
-            break;
-        }
-
-        return self::$_client;
+        $this->config['max_redirs'] = 10;
+        $this->config['follow_redirects'] = true;
+        parent::__construct($url, $method, $config);
+        $this->setHeader('User-Agent', $this->userAgent());
     }
 
-    function head($url, $headers)
+    /**
+     * Convenience/back-compat instantiator
+     * @return HTTPClient
+     */
+    public static function start()
     {
-        throw new Exception("HEAD method unimplemented");
+        return new HTTPClient();
     }
 
-    function get($url, $headers)
+    /**
+     * Convenience function to run a GET request.
+     *
+     * @return HTTPResponse
+     * @throws HTTP_Request2_Exception
+     */
+    public function get($url, $headers=array())
     {
-        throw new Exception("GET method unimplemented");
+        return $this->doRequest($url, self::METHOD_GET, $headers);
     }
 
-    function post($url, $headers, $body)
+    /**
+     * Convenience function to run a HEAD request.
+     *
+     * @return HTTPResponse
+     * @throws HTTP_Request2_Exception
+     */
+    public function head($url, $headers=array())
     {
-        throw new Exception("POST method unimplemented");
+        return $this->doRequest($url, self::METHOD_HEAD, $headers);
     }
 
-    function put($url, $headers, $body)
+    /**
+     * Convenience function to POST form data.
+     *
+     * @param string $url
+     * @param array $headers optional associative array of HTTP headers
+     * @param array $data optional associative array or blob of form data to submit
+     * @return HTTPResponse
+     * @throws HTTP_Request2_Exception
+     */
+    public function post($url, $headers=array(), $data=array())
     {
-        throw new Exception("PUT method unimplemented");
+        if ($data) {
+            $this->addPostParameter($data);
+        }
+        return $this->doRequest($url, self::METHOD_POST, $headers);
     }
 
-    function delete($url, $headers)
+    /**
+     * @return HTTPResponse
+     * @throws HTTP_Request2_Exception
+     */
+    protected function doRequest($url, $method, $headers)
     {
-        throw new Exception("DELETE method unimplemented");
+        $this->setUrl($url);
+        $this->setMethod($method);
+        if ($headers) {
+            foreach ($headers as $header) {
+                $this->setHeader($header);
+            }
+        }
+        $response = $this->send();
+        return $response;
+    }
+    
+    protected function log($level, $detail) {
+        $method = $this->getMethod();
+        $url = $this->getUrl();
+        common_log($level, __CLASS__ . ": HTTP $method $url - $detail");
     }
 
+    /**
+     * Pulls up StatusNet's customized user-agent string, so services
+     * we hit can track down the responsible software.
+     *
+     * @return string
+     */
     function userAgent()
     {
         return "StatusNet/".STATUSNET_VERSION." (".STATUSNET_CODENAME.")";
     }
+
+    /**
+     * Actually performs the HTTP request and returns an HTTPResponse object
+     * with response body and header info.
+     *
+     * Wraps around parent send() to add logging and redirection processing.
+     *
+     * @return HTTPResponse
+     * @throw HTTP_Request2_Exception
+     */
+    public function send()
+    {
+        $maxRedirs = intval($this->config['max_redirs']);
+        if (empty($this->config['follow_redirects'])) {
+            $maxRedirs = 0;
+        }
+        $redirs = 0;
+        do {
+            try {
+                $response = parent::send();
+            } catch (HTTP_Request2_Exception $e) {
+                $this->log(LOG_ERR, $e->getMessage());
+                throw $e;
+            }
+            $code = $response->getStatus();
+            if ($code >= 200 && $code < 300) {
+                $reason = $response->getReasonPhrase();
+                $this->log(LOG_INFO, "$code $reason");
+            } elseif ($code >= 300 && $code < 400) {
+                $url = $this->getUrl();
+                $target = $response->getHeader('Location');
+                
+                if (++$redirs >= $maxRedirs) {
+                    common_log(LOG_ERR, __CLASS__ . ": Too many redirects: skipping $code redirect from $url to $target");
+                    break;
+                }
+                try {
+                    $this->setUrl($target);
+                    $this->setHeader('Referer', $url);
+                    common_log(LOG_INFO, __CLASS__ . ": Following $code redirect from $url to $target");
+                    continue;
+                } catch (HTTP_Request2_Exception $e) {
+                    common_log(LOG_ERR, __CLASS__ . ": Invalid $code redirect from $url to $target");
+                }
+            } else {
+                $reason = $response->getReasonPhrase();
+                $this->log(LOG_ERR, "$code $reason");
+            }
+            break;
+        } while ($maxRedirs);
+        return new HTTPResponse($response, $this->getUrl(), $redirs);
+    }
 }
diff --git a/lib/imagefile.php b/lib/imagefile.php
index 88f461481..cf1668f20 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -72,14 +72,19 @@ class ImageFile
             break;
          case UPLOAD_ERR_INI_SIZE:
          case UPLOAD_ERR_FORM_SIZE:
-            throw new Exception(sprintf(_('That file is too big. The maximum file size is %d.'),
+            throw new Exception(sprintf(_('That file is too big. The maximum file size is %s.'),
                 ImageFile::maxFileSize()));
             return;
          case UPLOAD_ERR_PARTIAL:
             @unlink($_FILES[$param]['tmp_name']);
             throw new Exception(_('Partial upload.'));
             return;
+         case UPLOAD_ERR_NO_FILE:
+            // No file; probably just a non-AJAX submission.
+            return;
          default:
+            common_log(LOG_ERR, __METHOD__ . ": Unknown upload error " .
+                $_FILES[$param]['error']);
             throw new Exception(_('System error uploading file.'));
             return;
         }
diff --git a/lib/language.php b/lib/language.php
index 7dcb808c9..bec5620fd 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -100,38 +100,39 @@ function get_nice_language_list()
  * @return array mapping of language codes to language info
  */
 function get_all_languages() {
-	return array(
-		'bg'      => array('q' => 0.8, 'lang' => 'bg', 'name' => 'Bulgarian', 'direction' => 'ltr'),
-		'ca'      => array('q' => 0.5, 'lang' => 'ca', 'name' => 'Catalan', 'direction' => 'ltr'),
-		'cs'      => array('q' => 0.5, 'lang' => 'cs', 'name' => 'Czech', 'direction' => 'ltr'),
-		'de'      => array('q' => 0.8, 'lang' => 'de', 'name' => 'German', 'direction' => 'ltr'),
-		'el'      => array('q' => 0.1, 'lang' => 'el',    'name' => 'Greek', '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'),
-		'es'      => array('q' => 1, 'lang' => 'es',    'name' => 'Spanish', 'direction' => 'ltr'),
-		'fi'      => array('q' => 1, 'lang' => 'fi', 'name' => 'Finnish', 'direction' => 'ltr'),
-		'fr-fr'   => array('q' => 1, 'lang' => 'fr', 'name' => 'French', 'direction' => 'ltr'),
-		'ga'      => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Galician', 'direction' => 'ltr'),
-		'he'      => array('q' => 0.5, 'lang' => 'he', 'name' => 'Hebrew', 'direction' => 'rtl'),
-		'it'      => array('q' => 1, 'lang' => 'it', 'name' => 'Italian', 'direction' => 'ltr'),
-		'jp'      => array('q' => 0.5, 'lang' => 'ja', 'name' => 'Japanese', 'direction' => 'ltr'),
-		'ko'      => array('q' => 0.9, 'lang' => 'ko',    'name' => 'Korean', 'direction' => 'ltr'),
-		'mk'      => array('q' => 0.5, 'lang' => 'mk', 'name' => 'Macedonian', 'direction' => 'ltr'),
-		'nb'      => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
-		'no'      => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
-		'nn'      => array('q' => 1, 'lang' => 'nn', 'name' => 'Norwegian (Nynorsk)', 'direction' => 'ltr'),
-		'nl'      => array('q' => 0.5, 'lang' => 'nl', 'name' => 'Dutch', 'direction' => 'ltr'),
-		'pl'      => array('q' => 0.5, 'lang' => 'pl', 'name' => 'Polish', 'direction' => 'ltr'),
-		'pt'      => array('q' => 0.1, 'lang' => 'pt',    'name' => 'Portuguese', 'direction' => 'ltr'),
-		'pt-br'   => array('q' => 0.9, 'lang' => 'pt_BR', 'name' => 'Portuguese Brazil', 'direction' => 'ltr'),
-		'ru'      => array('q' => 0.9, 'lang' => 'ru', 'name' => 'Russian', 'direction' => 'ltr'),
-		'sv'      => array('q' => 0.8, 'lang' => 'sv', 'name' => 'Swedish', 'direction' => 'ltr'),
-		'te'      => array('q' => 0.3, 'lang' => 'te', 'name' => 'Telugu', 'direction' => 'ltr'),
-		'tr'      => array('q' => 0.5, 'lang' => 'tr', 'name' => 'Turkish', 'direction' => 'ltr'),
-		'uk'      => array('q' => 1, 'lang' => 'uk', 'name' => 'Ukrainian', 'direction' => 'ltr'),
-		'vi'      => array('q' => 0.8, 'lang' => 'vi', 'name' => 'Vietnamese', 'direction' => 'ltr'),
-		'zh-cn'   => array('q' => 0.9, 'lang' => 'zh_CN', 'name' => 'Chinese (Simplified)', 'direction' => 'ltr'),
-		'zh-hant' => array('q' => 0.2, 'lang' => 'zh_TW', 'name' => 'Chinese (Taiwanese)', 'direction' => 'ltr'),
-	);
+    return array(
+        'bg'      => array('q' => 0.8, 'lang' => 'bg', 'name' => 'Bulgarian', 'direction' => 'ltr'),
+        'ca'      => array('q' => 0.5, 'lang' => 'ca', 'name' => 'Catalan', 'direction' => 'ltr'),
+        'cs'      => array('q' => 0.5, 'lang' => 'cs', 'name' => 'Czech', 'direction' => 'ltr'),
+        'de'      => array('q' => 0.8, 'lang' => 'de', 'name' => 'German', 'direction' => 'ltr'),
+        'el'      => array('q' => 0.1, 'lang' => 'el',    'name' => 'Greek', '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'),
+        'es'      => array('q' => 1, 'lang' => 'es',    'name' => 'Spanish', 'direction' => 'ltr'),
+        'fi'      => array('q' => 1, 'lang' => 'fi', 'name' => 'Finnish', 'direction' => 'ltr'),
+        'fr-fr'   => array('q' => 1, 'lang' => 'fr', 'name' => 'French', 'direction' => 'ltr'),
+        'ga'      => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Galician', 'direction' => 'ltr'),
+        'he'      => array('q' => 0.5, 'lang' => 'he', 'name' => 'Hebrew', 'direction' => 'rtl'),
+        'is'      => array('q' => 0.1, 'lang' => 'is', 'name' => 'Icelandic', 'direction' => 'ltr'),
+        'it'      => array('q' => 1, 'lang' => 'it', 'name' => 'Italian', 'direction' => 'ltr'),
+        'jp'      => array('q' => 0.5, 'lang' => 'ja', 'name' => 'Japanese', 'direction' => 'ltr'),
+        'ko'      => array('q' => 0.9, 'lang' => 'ko',    'name' => 'Korean', 'direction' => 'ltr'),
+        'mk'      => array('q' => 0.5, 'lang' => 'mk', 'name' => 'Macedonian', 'direction' => 'ltr'),
+        'nb'      => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
+        'no'      => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
+        'nn'      => array('q' => 1, 'lang' => 'nn', 'name' => 'Norwegian (Nynorsk)', 'direction' => 'ltr'),
+        'nl'      => array('q' => 0.5, 'lang' => 'nl', 'name' => 'Dutch', 'direction' => 'ltr'),
+        'pl'      => array('q' => 0.5, 'lang' => 'pl', 'name' => 'Polish', 'direction' => 'ltr'),
+        'pt'      => array('q' => 0.1, 'lang' => 'pt',    'name' => 'Portuguese', 'direction' => 'ltr'),
+        'pt-br'   => array('q' => 0.9, 'lang' => 'pt_BR', 'name' => 'Portuguese Brazil', 'direction' => 'ltr'),
+        'ru'      => array('q' => 0.9, 'lang' => 'ru', 'name' => 'Russian', 'direction' => 'ltr'),
+        'sv'      => array('q' => 0.8, 'lang' => 'sv', 'name' => 'Swedish', 'direction' => 'ltr'),
+        'te'      => array('q' => 0.3, 'lang' => 'te', 'name' => 'Telugu', 'direction' => 'ltr'),
+        'tr'      => array('q' => 0.5, 'lang' => 'tr', 'name' => 'Turkish', 'direction' => 'ltr'),
+        'uk'      => array('q' => 1, 'lang' => 'uk', 'name' => 'Ukrainian', 'direction' => 'ltr'),
+        'vi'      => array('q' => 0.8, 'lang' => 'vi', 'name' => 'Vietnamese', 'direction' => 'ltr'),
+        'zh-cn'   => array('q' => 0.9, 'lang' => 'zh_CN', 'name' => 'Chinese (Simplified)', 'direction' => 'ltr'),
+        'zh-hant' => array('q' => 0.2, 'lang' => 'zh_TW', 'name' => 'Chinese (Taiwanese)', 'direction' => 'ltr'),
+    );
 }
diff --git a/lib/mediafile.php b/lib/mediafile.php
index d4d184dd0..29d752f0c 100644
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -152,6 +152,9 @@ class MediaFile
             throw new ClientException(_('The uploaded file was only' .
                 ' partially uploaded.'));
             return;
+        case UPLOAD_ERR_NO_FILE:
+            // No file; probably just a non-AJAX submission.
+            return;
         case UPLOAD_ERR_NO_TMP_DIR:
             throw new ClientException(_('Missing a temporary folder.'));
             return;
@@ -162,6 +165,8 @@ class MediaFile
             throw new ClientException(_('File upload stopped by extension.'));
             return;
         default:
+            common_log(LOG_ERR, __METHOD__ . ": Unknown upload error " .
+                $_FILES[$param]['error']);
             throw new ClientException(_('System error uploading file.'));
             return;
         }
diff --git a/lib/oauthclient.php b/lib/oauthclient.php
index f1827726e..1a86e2460 100644
--- a/lib/oauthclient.php
+++ b/lib/oauthclient.php
@@ -43,7 +43,7 @@ require_once 'OAuth.php';
  * @link     http://status.net/
  *
  */
-class OAuthClientCurlException extends Exception
+class OAuthClientException extends Exception
 {
 }
 
@@ -97,9 +97,14 @@ class OAuthClient
     function getRequestToken($url)
     {
         $response = $this->oAuthGet($url);
-        parse_str($response);
-        $token = new OAuthToken($oauth_token, $oauth_token_secret);
-        return $token;
+        $arr = array();
+        parse_str($response, $arr);
+        if (isset($arr['oauth_token']) && isset($arr['oauth_token_secret'])) {
+            $token = new OAuthToken($arr['oauth_token'], @$arr['oauth_token_secret']);
+            return $token;
+        } else {
+            throw new OAuthClientException();
+        }
     }
 
     /**
@@ -177,7 +182,7 @@ class OAuthClient
     }
 
     /**
-     * Make a HTTP request using cURL.
+     * Make a HTTP request.
      *
      * @param string $url    Where to make the
      * @param array  $params post parameters
@@ -186,40 +191,32 @@ class OAuthClient
      */
     function httpRequest($url, $params = null)
     {
-        $options = array(
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_FAILONERROR    => true,
-            CURLOPT_HEADER         => false,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_USERAGENT      => 'StatusNet',
-            CURLOPT_CONNECTTIMEOUT => 120,
-            CURLOPT_TIMEOUT        => 120,
-            CURLOPT_HTTPAUTH       => CURLAUTH_ANY,
-            CURLOPT_SSL_VERIFYPEER => false,
-
-            // Twitter is strict about accepting invalid "Expect" headers
-
-            CURLOPT_HTTPHEADER => array('Expect:')
-        );
+        $request = new HTTPClient($url);
+        $request->setConfig(array(
+            'connect_timeout' => 120,
+            'timeout' => 120,
+            'follow_redirects' => true,
+            'ssl_verify_peer' => false,
+        ));
+
+        // Twitter is strict about accepting invalid "Expect" headers
+        $request->setHeader('Expect', '');
 
         if (isset($params)) {
-            $options[CURLOPT_POST]       = true;
-            $options[CURLOPT_POSTFIELDS] = $params;
+            $request->setMethod(HTTP_Request2::METHOD_POST);
+            $request->setBody($params);
         }
 
-        $ch = curl_init($url);
-        curl_setopt_array($ch, $options);
-        $response = curl_exec($ch);
-
-        if ($response === false) {
-            $msg  = curl_error($ch);
-            $code = curl_errno($ch);
-            throw new OAuthClientCurlException($msg, $code);
+        try {
+            $response = $request->send();
+            $code = $response->getStatus();
+            if ($code < 200 || $code >= 400) {
+                throw new OAuthClientException($response->getBody(), $code);
+            }
+            return $response->getBody();
+        } catch (Exception $e) {
+            throw new OAuthClientException($e->getMessage(), $e->getCode());
         }
-
-        curl_close($ch);
-
-        return $response;
     }
 
 }
diff --git a/lib/ping.php b/lib/ping.php
index 175bf8440..5698c4038 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -44,20 +44,16 @@ function ping_broadcast_notice($notice) {
 																array('nickname' => $profile->nickname)),
 											   $tags));
 
-            $context = stream_context_create(array('http' => array('method' => "POST",
-                                                                   'header' =>
-                                                                   "Content-Type: text/xml\r\n".
-                                                                   "User-Agent: StatusNet/".STATUSNET_VERSION."\r\n",
-                                                                   'content' => $req)));
-            $file = file_get_contents($notify_url, false, $context);
+            $request = HTTPClient::start();
+            $httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req);
 
-            if ($file === false || mb_strlen($file) == 0) {
+            if (!$httpResponse || mb_strlen($httpResponse->getBody()) == 0) {
                 common_log(LOG_WARNING,
                            "XML-RPC empty results for ping ($notify_url, $notice->id) ");
                 continue;
             }
 
-            $response = xmlrpc_decode($file);
+            $response = xmlrpc_decode($httpResponse->getBody());
 
             if (is_array($response) && xmlrpc_is_fault($response)) {
                 common_log(LOG_WARNING,
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 5cc211e36..bbb722701 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -182,7 +182,8 @@ class ProfileListItem extends Widget
     {
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
         $this->out->elementStart('a', array('href' => $this->profile->profileurl,
-                                            'class' => 'url'));
+                                            'class' => 'url',
+                                            'rel' => 'contact'));
         $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE),
                                          'class' => 'photo avatar',
                                          'width' => AVATAR_STREAM_SIZE,
@@ -190,7 +191,7 @@ class ProfileListItem extends Widget
                                          'alt' =>
                                          ($this->profile->fullname) ? $this->profile->fullname :
                                          $this->profile->nickname));
-        $hasFN = ($this->profile->fullname !== '') ? 'nickname' : 'fn nickname';
+        $hasFN = (!empty($this->profile->fullname)) ? 'nickname' : 'fn nickname';
         $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->profile->nickname));
         $this->out->elementEnd('span');
@@ -200,53 +201,37 @@ class ProfileListItem extends Widget
     function showFullName()
     {
         if (!empty($this->profile->fullname)) {
-            $this->out->elementStart('dl', 'entity_fn');
-            $this->out->element('dt', null, 'Full name');
-            $this->out->elementStart('dd');
             $this->out->elementStart('span', 'fn');
             $this->out->raw($this->highlight($this->profile->fullname));
             $this->out->elementEnd('span');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
     }
 
     function showLocation()
     {
         if (!empty($this->profile->location)) {
-            $this->out->elementStart('dl', 'entity_location');
-            $this->out->element('dt', null, _('Location'));
-            $this->out->elementStart('dd', 'label');
+            $this->out->elementStart('span', 'location');
             $this->out->raw($this->highlight($this->profile->location));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
+            $this->out->elementEnd('span');
         }
     }
 
     function showHomepage()
     {
         if (!empty($this->profile->homepage)) {
-            $this->out->elementStart('dl', 'entity_url');
-            $this->out->element('dt', null, _('URL'));
-            $this->out->elementStart('dd');
             $this->out->elementStart('a', array('href' => $this->profile->homepage,
                                                 'class' => 'url'));
             $this->out->raw($this->highlight($this->profile->homepage));
             $this->out->elementEnd('a');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
     }
 
     function showBio()
     {
         if (!empty($this->profile->bio)) {
-            $this->out->elementStart('dl', 'entity_note');
-            $this->out->element('dt', null, _('Note'));
-            $this->out->elementStart('dd', 'note');
+            $this->out->elementStart('p', 'note');
             $this->out->raw($this->highlight($this->profile->bio));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
+            $this->out->elementEnd('p');
         }
     }
 
diff --git a/lib/router.php b/lib/router.php
index 64853e419..db9fdb470 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -88,6 +88,8 @@ class Router
 
             $m->connect('doc/:title', array('action' => 'doc'));
 
+            $m->connect('main/login?user_id=:user_id&token=:token', array('action'=>'login'), array('user_id'=> '[0-9]+', 'token'=>'.+'));
+
             // main stuff is repetitive
 
             $main = array('login', 'logout', 'register', 'subscribe',
@@ -120,7 +122,7 @@ class Router
             // exceptional
 
             $m->connect('main/remote', array('action' => 'remotesubscribe'));
-            $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+'));
+            $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '['.NICKNAME_FMT.']+'));
 
             foreach (Router::$bare as $action) {
                 $m->connect('index.php?action=' . $action, array('action' => $action));
@@ -164,10 +166,10 @@ class Router
             $m->connect('notice/new', array('action' => 'newnotice'));
             $m->connect('notice/new?replyto=:replyto',
                         array('action' => 'newnotice'),
-                        array('replyto' => '[A-Za-z0-9_-]+'));
+                        array('replyto' => '['.NICKNAME_FMT.']+'));
             $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
                         array('action' => 'newnotice'),
-                        array('replyto' => '[A-Za-z0-9_-]+'),
+                        array('replyto' => '['.NICKNAME_FMT.']+'),
                         array('inreplyto' => '[0-9]+'));
 
             $m->connect('notice/:notice/file',
@@ -191,7 +193,7 @@ class Router
                         array('id' => '[0-9]+'));
 
             $m->connect('message/new', array('action' => 'newmessage'));
-            $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '[A-Za-z0-9_-]+'));
+            $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '['.NICKNAME_FMT.']+'));
             $m->connect('message/:message',
                         array('action' => 'showmessage'),
                         array('message' => '[0-9]+'));
@@ -275,7 +277,7 @@ class Router
 
             $m->connect('api/statuses/friends_timeline/:id.:format',
                         array('action' => 'ApiTimelineFriends',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json|rss|atom)'));
             $m->connect('api/statuses/home_timeline.:format',
                         array('action' => 'ApiTimelineFriends',
@@ -283,7 +285,7 @@ class Router
 
             $m->connect('api/statuses/home_timeline/:id.:format',
                         array('action' => 'ApiTimelineFriends',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json|rss|atom)'));
 
             $m->connect('api/statuses/user_timeline.:format',
@@ -292,7 +294,7 @@ class Router
 
             $m->connect('api/statuses/user_timeline/:id.:format',
                         array('action' => 'ApiTimelineUser',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json|rss|atom)'));
 
             $m->connect('api/statuses/mentions.:format',
@@ -301,7 +303,7 @@ class Router
 
             $m->connect('api/statuses/mentions/:id.:format',
                         array('action' => 'ApiTimelineMentions',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json|rss|atom)'));
 
             $m->connect('api/statuses/replies.:format',
@@ -310,7 +312,7 @@ class Router
 
             $m->connect('api/statuses/replies/:id.:format',
                         array('action' => 'ApiTimelineMentions',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json|rss|atom)'));
 
             $m->connect('api/statuses/friends.:format',
@@ -319,7 +321,7 @@ class Router
 
             $m->connect('api/statuses/friends/:id.:format',
                         array('action' => 'ApiUserFriends',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json)'));
 
             $m->connect('api/statuses/followers.:format',
@@ -328,7 +330,7 @@ class Router
 
             $m->connect('api/statuses/followers/:id.:format',
                         array('action' => 'ApiUserFollowers',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json)'));
 
             $m->connect('api/statuses/show.:format',
@@ -357,14 +359,9 @@ class Router
 
             $m->connect('api/users/show/:id.:format',
                         array('action' => 'ApiUserShow',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json)'));
 
-            $m->connect('api/users/:method',
-                        array('action' => 'api',
-                              'apiaction' => 'users'),
-                        array('method' => 'show(\.(xml|json))?'));
-
             // direct messages
 
             $m->connect('api/direct_messages.:format',
@@ -400,12 +397,12 @@ class Router
 
             $m->connect('api/friendships/create/:id.:format',
                         array('action' => 'ApiFriendshipsCreate',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json)'));
 
             $m->connect('api/friendships/destroy/:id.:format',
                         array('action' => 'ApiFriendshipsDestroy',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json)'));
 
             // Social graph
@@ -431,6 +428,9 @@ class Router
             $m->connect('api/account/verify_credentials.:format',
                         array('action' => 'ApiAccountVerifyCredentials'));
 
+            $m->connect('api/account/update_profile_image.:format',
+                        array('action' => 'ApiAccountUpdateProfileImage'));
+
             // special case where verify_credentials is called w/out a format
 
             $m->connect('api/account/verify_credentials',
@@ -447,35 +447,28 @@ class Router
 
             $m->connect('api/favorites/:id.:format',
                         array('action' => 'ApiTimelineFavorites',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xmljson|rss|atom)'));
 
             $m->connect('api/favorites/create/:id.:format',
                         array('action' => 'ApiFavoriteCreate',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json)'));
 
             $m->connect('api/favorites/destroy/:id.:format',
                         array('action' => 'ApiFavoriteDestroy',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json)'));
-
-            // notifications
-
-            $m->connect('api/notifications/:method/:argument',
-                        array('action' => 'api',
-                              'apiaction' => 'favorites'));
-
             // blocks
 
             $m->connect('api/blocks/create/:id.:format',
                         array('action' => 'ApiBlockCreate',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json)'));
 
             $m->connect('api/blocks/destroy/:id.:format',
                         array('action' => 'ApiBlockDestroy',
-                              'id' => '[a-zA-Z0-9]+',
+                              'id' => '['.NICKNAME_FMT.']+',
                               'format' => '(xml|json)'));
             // help
 
@@ -591,14 +584,14 @@ class Router
                            'replies', 'inbox', 'outbox', 'microsummary') as $a) {
                 $m->connect(':nickname/'.$a,
                             array('action' => $a),
-                            array('nickname' => '[a-zA-Z0-9]{1,64}'));
+                            array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
             }
 
             foreach (array('subscriptions', 'subscribers') as $a) {
                 $m->connect(':nickname/'.$a.'/:tag',
                             array('action' => $a),
                             array('tag' => '[a-zA-Z0-9]+',
-                                  'nickname' => '[a-zA-Z0-9]{1,64}'));
+                                  'nickname' => '['.NICKNAME_FMT.']{1,64}'));
             }
 
             foreach (array('rss', 'groups') as $a) {
@@ -610,31 +603,31 @@ class Router
             foreach (array('all', 'replies', 'favorites') as $a) {
                 $m->connect(':nickname/'.$a.'/rss',
                             array('action' => $a.'rss'),
-                            array('nickname' => '[a-zA-Z0-9]{1,64}'));
+                            array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
             }
 
             $m->connect(':nickname/favorites',
                         array('action' => 'showfavorites'),
-                        array('nickname' => '[a-zA-Z0-9]{1,64}'));
+                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
 
             $m->connect(':nickname/avatar/:size',
                         array('action' => 'avatarbynickname'),
                         array('size' => '(original|96|48|24)',
-                              'nickname' => '[a-zA-Z0-9]{1,64}'));
+                              'nickname' => '['.NICKNAME_FMT.']{1,64}'));
 
             $m->connect(':nickname/tag/:tag/rss',
                         array('action' => 'userrss'),
-                        array('nickname' => '[a-zA-Z0-9]{1,64}'),
+                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'),
                         array('tag' => '[a-zA-Z0-9]+'));
 
             $m->connect(':nickname/tag/:tag',
                         array('action' => 'showstream'),
-                        array('nickname' => '[a-zA-Z0-9]{1,64}'),
+                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'),
                         array('tag' => '[a-zA-Z0-9]+'));
 
             $m->connect(':nickname',
                         array('action' => 'showstream'),
-                        array('nickname' => '[a-zA-Z0-9]{1,64}'));
+                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
 
             Event::handle('RouterInitialized', array($m));
         }
diff --git a/lib/snapshot.php b/lib/snapshot.php
index ede846e5b..2a10c6b93 100644
--- a/lib/snapshot.php
+++ b/lib/snapshot.php
@@ -172,26 +172,9 @@ class Snapshot
     {
         // XXX: Use OICU2 and OAuth to make authorized requests
 
-        $postdata = http_build_query($this->stats);
-
-        $opts =
-          array('http' =>
-                array(
-                      'method'  => 'POST',
-                      'header'  => 'Content-type: '.
-                                   'application/x-www-form-urlencoded',
-                      'content' => $postdata,
-                      'user_agent' => 'StatusNet/'.STATUSNET_VERSION
-                      )
-                );
-
-        $context = stream_context_create($opts);
-
         $reporturl = common_config('snapshot', 'reporturl');
-
-        $result = @file_get_contents($reporturl, false, $context);
-
-        return $result;
+        $request = HTTPClient::start();
+        $request->post($reporturl, null, $this->stats);
     }
 
     /**
diff --git a/lib/userprofile.php b/lib/userprofile.php
new file mode 100644
index 000000000..ca1b38c8b
--- /dev/null
+++ b/lib/userprofile.php
@@ -0,0 +1,323 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Profile for a particular user
+ *
+ * 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  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2008 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);
+}
+
+require_once INSTALLDIR.'/lib/widget.php';
+
+/**
+ * Profile of a user
+ *
+ * Shows profile information about a particular user
+ *
+ * @category Output
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      HTMLOutputter
+ */
+
+class UserProfile extends Widget
+{
+    var $user = null;
+    var $profile = null;
+
+    function __construct($action=null, $user=null, $profile=null)
+    {
+        parent::__construct($action);
+        $this->user = $user;
+        $this->profile = $profile;
+    }
+
+    function show()
+    {
+        $this->showProfileData();
+        $this->showEntityActions();
+    }
+
+    function showProfileData()
+    {
+        if (Event::handle('StartProfilePageProfileSection', array(&$this, $this->profile))) {
+
+            $this->out->elementStart('div', 'entity_profile vcard author');
+            $this->out->element('h2', null, _('User profile'));
+
+            if (Event::handle('StartProfilePageProfileElements', array(&$this, $this->profile))) {
+
+                $this->showAvatar();
+                $this->showNickname();
+                $this->showFullName();
+                $this->showLocation();
+                $this->showHomepage();
+                $this->showBio();
+                $this->showProfileTags();
+
+                Event::handle('EndProfilePageProfileElements', array(&$this, $this->profile));
+            }
+
+            $this->out->elementEnd('div');
+            Event::handle('EndProfilePageProfileSection', array(&$this, $this->profile));
+        }
+    }
+
+    function showAvatar()
+    {
+        if (Event::handle('StartProfilePageAvatar', array($this, $this->profile))) {
+
+            $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+
+            $this->out->elementStart('dl', 'entity_depiction');
+            $this->out->element('dt', null, _('Photo'));
+            $this->out->elementStart('dd');
+            $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
+                                        'class' => 'photo avatar',
+                                        'width' => AVATAR_PROFILE_SIZE,
+                                        'height' => AVATAR_PROFILE_SIZE,
+                                        'alt' => $this->profile->nickname));
+            $this->out->elementEnd('dd');
+
+            $user = User::staticGet('id', $this->profile->id);
+
+            $cur = common_current_user();
+            if ($cur && $cur->id == $user->id) {
+                $this->out->elementStart('dd');
+                $this->out->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
+                $this->out->elementEnd('dd');
+            }
+
+            $this->out->elementEnd('dl');
+
+            Event::handle('EndProfilePageAvatar', array($this, $this->profile));
+        }
+    }
+
+    function showNickname()
+    {
+        if (Event::handle('StartProfilePageNickname', array($this, $this->profile))) {
+
+            $this->out->elementStart('dl', 'entity_nickname');
+            $this->out->element('dt', null, _('Nickname'));
+            $this->out->elementStart('dd');
+            $hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid';
+            $this->out->element('a', array('href' => $this->profile->profileurl,
+                                      'rel' => 'me', 'class' => $hasFN),
+                           $this->profile->nickname);
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
+
+            Event::handle('EndProfilePageNickname', array($this, $this->profile));
+        }
+    }
+
+    function showFullName()
+    {
+        if (Event::handle('StartProfilePageFullName', array($this, $this->profile))) {
+            if ($this->profile->fullname) {
+                $this->out->elementStart('dl', 'entity_fn');
+                $this->out->element('dt', null, _('Full name'));
+                $this->out->elementStart('dd');
+                $this->out->element('span', 'fn', $this->profile->fullname);
+                $this->out->elementEnd('dd');
+                $this->out->elementEnd('dl');
+            }
+            Event::handle('EndProfilePageFullName', array($this, $this->profile));
+        }
+    }
+
+    function showLocation()
+    {
+        if (Event::handle('StartProfilePageLocation', array($this, $this->profile))) {
+            if ($this->profile->location) {
+                $this->out->elementStart('dl', 'entity_location');
+                $this->out->element('dt', null, _('Location'));
+                $this->out->element('dd', 'label', $this->profile->location);
+                $this->out->elementEnd('dl');
+            }
+            Event::handle('EndProfilePageLocation', array($this, $this->profile));
+        }
+    }
+
+    function showHomepage()
+    {
+        if (Event::handle('StartProfilePageHomepage', array($this, $this->profile))) {
+            if ($this->profile->homepage) {
+                $this->out->elementStart('dl', 'entity_url');
+                $this->out->element('dt', null, _('URL'));
+                $this->out->elementStart('dd');
+                $this->out->element('a', array('href' => $this->profile->homepage,
+                                          'rel' => 'me', 'class' => 'url'),
+                               $this->profile->homepage);
+                $this->out->elementEnd('dd');
+                $this->out->elementEnd('dl');
+            }
+            Event::handle('EndProfilePageHomepage', array($this, $this->profile));
+        }
+    }
+
+    function showBio()
+    {
+        if (Event::handle('StartProfilePageBio', array($this, $this->profile))) {
+            if ($this->profile->bio) {
+                $this->out->elementStart('dl', 'entity_note');
+                $this->out->element('dt', null, _('Note'));
+                $this->out->element('dd', 'note', $this->profile->bio);
+                $this->out->elementEnd('dl');
+            }
+            Event::handle('EndProfilePageBio', array($this, $this->profile));
+        }
+    }
+
+    function showProfileTags()
+    {
+        if (Event::handle('StartProfilePageProfileTags', array($this, $this->profile))) {
+            $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
+
+            if (count($tags) > 0) {
+                $this->out->elementStart('dl', 'entity_tags');
+                $this->out->element('dt', null, _('Tags'));
+                $this->out->elementStart('dd');
+                $this->out->elementStart('ul', 'tags xoxo');
+                foreach ($tags as $tag) {
+                    $this->out->elementStart('li');
+                    // Avoid space by using raw output.
+                    $pt = '<span class="mark_hash">#</span><a rel="tag" href="' .
+                      common_local_url('peopletag', array('tag' => $tag)) .
+                      '">' . $tag . '</a>';
+                    $this->out->raw($pt);
+                    $this->out->elementEnd('li');
+                }
+                $this->out->elementEnd('ul');
+                $this->out->elementEnd('dd');
+                $this->out->elementEnd('dl');
+            }
+            Event::handle('EndProfilePageProfileTags', array($this, $this->profile));
+        }
+    }
+
+    function showEntityActions()
+    {
+        if (Event::handle('StartProfilePageActionsSection', array(&$this, $this->profile))) {
+
+            $cur = common_current_user();
+
+            $this->out->elementStart('div', 'entity_actions');
+            $this->out->element('h2', null, _('User actions'));
+            $this->out->elementStart('ul');
+
+            if (Event::handle('StartProfilePageActionsElements', array(&$this, $this->profile))) {
+                if (empty($cur)) { // not logged in
+                    $this->out->elementStart('li', 'entity_subscribe');
+                    $this->showRemoteSubscribeLink();
+                    $this->out->elementEnd('li');
+                } else {
+                    if ($cur->id == $this->profile->id) { // your own page
+                        $this->out->elementStart('li', 'entity_edit');
+                        $this->out->element('a', array('href' => common_local_url('profilesettings'),
+                                                  'title' => _('Edit profile settings')),
+                                       _('Edit'));
+                        $this->out->elementEnd('li');
+                    } else { // someone else's page
+
+                        // subscribe/unsubscribe button
+
+                        $this->out->elementStart('li', 'entity_subscribe');
+
+                        if ($cur->isSubscribed($this->profile)) {
+                            $usf = new UnsubscribeForm($this->out, $this->profile);
+                            $usf->show();
+                        } else {
+                            $sf = new SubscribeForm($this->out, $this->profile);
+                            $sf->show();
+                        }
+                        $this->out->elementEnd('li');
+
+                        if ($cur->mutuallySubscribed($this->user)) {
+
+                            // message
+
+                            $this->out->elementStart('li', 'entity_send-a-message');
+                            $this->out->element('a', array('href' => common_local_url('newmessage', array('to' => $this->user->id)),
+                                                      'title' => _('Send a direct message to this user')),
+                                           _('Message'));
+                            $this->out->elementEnd('li');
+
+                            // nudge
+
+                            if ($this->user->email && $this->user->emailnotifynudge) {
+                                $this->out->elementStart('li', 'entity_nudge');
+                                $nf = new NudgeForm($this->out, $this->user);
+                                $nf->show();
+                                $this->out->elementEnd('li');
+                            }
+                        }
+
+                        // block/unblock
+
+                        $blocked = $cur->hasBlocked($this->profile);
+                        $this->out->elementStart('li', 'entity_block');
+                        if ($blocked) {
+                            $ubf = new UnblockForm($this->out, $this->profile,
+                                                   array('action' => 'showstream',
+                                                         'nickname' => $this->profile->nickname));
+                            $ubf->show();
+                        } else {
+                            $bf = new BlockForm($this->out, $this->profile,
+                                                array('action' => 'showstream',
+                                                      'nickname' => $this->profile->nickname));
+                            $bf->show();
+                        }
+                        $this->out->elementEnd('li');
+                    }
+                }
+
+                Event::handle('EndProfilePageActionsElements', array(&$this, $this->profile));
+            }
+
+            $this->out->elementEnd('ul');
+            $this->out->elementEnd('div');
+
+            Event::handle('EndProfilePageActionsSection', array(&$this, $this->profile));
+        }
+    }
+
+    function showRemoteSubscribeLink()
+    {
+        $url = common_local_url('remotesubscribe',
+                                array('nickname' => $this->profile->nickname));
+        $this->out->element('a', array('href' => $url,
+                                  'class' => 'entity_remote_subscribe'),
+                       _('Subscribe'));
+    }
+}
diff --git a/lib/util.php b/lib/util.php
index d159c583e..a4865c46c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -119,16 +119,44 @@ function common_munge_password($password, $id)
 // check if a username exists and has matching password
 function common_check_user($nickname, $password)
 {
-    // NEVER allow blank passwords, even if they match the DB
-    if (mb_strlen($password) == 0) {
-        return false;
-    }
+    $authenticated = false;
+    $eventResult = Event::handle('CheckPassword', array($nickname, $password, &$authenticated));
     $user = User::staticGet('nickname', $nickname);
     if (is_null($user) || $user === false) {
-        return false;
+        //user does not exist
+        if($authenticated){
+            //a handler said these are valid credentials, so see if a plugin wants to auto register the user
+            if(Event::handle('AutoRegister', array($nickname))){
+                //no handler registered the user
+                return false;
+            }else{
+                $user = User::staticGet('nickname', $nickname);
+                if (is_null($user) || $user === false) {
+                    common_log(LOG_WARNING, "A plugin handled the AutoRegister event, but did not actually register the user, nickname: $nickname");
+                    return false;
+                }else{
+                    return $user;
+                }
+            }
+        }else{
+            //no handler indicated the credentials were valid, and we know their not valid because the user isn't in the database
+            return false;
+        }
     } else {
-        if (0 == strcmp(common_munge_password($password, $user->id),
-                        $user->password)) {
+        if($eventResult && ! $authenticated){
+            //no handler was authoritative
+            if (mb_strlen($password) == 0) {
+                // NEVER allow blank passwords, even if they match the DB
+                return false;
+            }else{
+                if (0 == strcmp(common_munge_password($password, $user->id),
+                                $user->password)) {
+                    //internal checking passed
+                    $authenticated = true;
+                }
+            }
+        }
+        if($authenticated){
             return $user;
         } else {
             return false;
@@ -422,7 +450,7 @@ function common_render_text($text)
 function common_replace_urls_callback($text, $callback, $notice_id = null) {
     // Start off with a regex
     $regex = '#'.
-    '(?:^|[\s\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'.
+    '(?:^|[\s\<\>\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'.
     '('.
         '(?:'.
             '(?:'. //Known protocols
@@ -452,9 +480,9 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
         ')'.
         '(?:'.
             '(?:\:\d+)?'. //:port
-            '(?:/[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"@]*)?'. // /path
-            '(?:\?[\pN\pL\$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"@\/]*)?'. // ?query string
-            '(?:\#[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"\@/\?\#]*)?'. // #fragment
+            '(?:/[\pN\pL$\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'@]*)?'. // /path
+            '(?:\?[\pN\pL\$\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'@\/]*)?'. // ?query string
+            '(?:\#[\pN\pL$\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\@/\?\#]*)?'. // #fragment
         ')(?<![\?\.\,\#\,])'.
     ')'.
     '#ixu';
@@ -480,6 +508,10 @@ function callback_helper($matches, $callback, $notice_id) {
         array(
             'left'=>'{',
             'right'=>'}'
+        ),
+        array(
+            'left'=>'<',
+            'right'=>'>'
         )
     );
     $cannotEndWith=array('.','?',',','#');
@@ -1366,9 +1398,28 @@ function common_memcache()
     }
 }
 
+function common_license_terms($uri)
+{
+    if(preg_match('/creativecommons.org\/licenses\/([^\/]+)/', $uri, $matches)) {
+        return explode('-',$matches[1]);
+    }
+    return array($uri);
+}
+
 function common_compatible_license($from, $to)
 {
+    $from_terms = common_license_terms($from);
+    // public domain and cc-by are compatible with everything
+    if(count($from_terms) == 1 && ($from_terms[0] == 'publicdomain' || $from_terms[0] == 'by')) {
+        return true;
+    }
+    $to_terms = common_license_terms($to);
+    // sa is compatible across versions. IANAL
+    if(in_array('sa',$from_terms) || in_array('sa',$to_terms)) {
+        return count(array_diff($from_terms, $to_terms)) == 0;
+    }
     // XXX: better compatibility check needed here!
+    // Should at least normalise URIs
     return ($from == $to);
 }
 
diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo
index 335fe0b92..698158b1d 100644
--- a/locale/bg/LC_MESSAGES/statusnet.mo
+++ b/locale/bg/LC_MESSAGES/statusnet.mo
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index c0bc8379f..004cc141f 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -1,32 +1,29 @@
-# #-#-#-#-#  statusnet.pot (StatusNet 0.6.4)  #-#-#-#-#
-# StatusNet Bulgarian translation.
-# Copyright (C) 2008
-# This file is distributed under the same license as the StatusNet package.
-# Yasen Pramatarov <yasen@lindeas.com>, 2008
-# Stoyan Zhekov <statusnet@zh.otherinbox.com>, 2008
+# Translation of StatusNet to Bulgarian
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: StatusNet 0.6.4\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-06-27 18:04+0000\n"
-"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:42:55+0000\n"
+"Language-Team: Bulgarian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: bg\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Тър�ене на \"%s\" в потока"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr " о�вен тези лични данни: парола, е-поща, ме�инджър, телефон."
@@ -37,17 +34,19 @@ msgid " from "
 msgstr " от "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Реплики на %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s ви кани да ползвате заедно %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -105,6 +104,7 @@ msgstr ""
 "И�крено ваши, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s вече получава бележките ви в %2$s."
@@ -127,25 +127,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s реплики на �ъобщени� от %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Бележка на %1$s от %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "Общ поток в %s"
@@ -155,34 +158,48 @@ msgstr "Общ поток в %s"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s и при�тели"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Общ поток на %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "Съ�то�ние на %s"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Поток на %s"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -190,7 +207,8 @@ msgstr ""
 "(Тр�бва да получите веднага електронно пи�мо � указани� за потвърждаване "
 "адре�а на е-пощата ви.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -199,7 +217,8 @@ msgstr ""
 "**%%site.name%%** е у�луга за микроблогване, предо�тавена ви от [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** е у�луга за микроблогване. "
@@ -211,32 +230,36 @@ msgstr ". ИзпиÑ�ват Ñ�е пълните имена или пÑ�евдонÐ
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "От 1 до 64 малки букви или цифри, без пунктоаци� и интервали"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "От 1 до 64 малки букви или цифри, без пунктоаци� и интервали. Задължително "
 "поле."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 или повече знака"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 или повече знака. И не ги забрав�йте!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 или повече знака. Задължително поле."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -246,6 +269,7 @@ msgstr ""
 "от %s, тр�бва да го одобрите."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -281,7 +305,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "�е е открит методът в API."
 
@@ -304,16 +355,23 @@ msgstr "�е е открит методът в API."
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "Методът в API в�е още �е разработва."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Отно�но"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Приемане"
 
@@ -324,6 +382,9 @@ msgstr "Приемане"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Добав�не"
 
@@ -341,27 +402,29 @@ msgstr "Добав�не или премахване OpenID"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "�дре�"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "�дре�и на при�тели, които каните (по един на ред)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "В�ички абонаменти"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "В�ички бележки за %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "В�ички бележки, намерени � \"%s\""
@@ -371,30 +434,37 @@ msgstr "В�ички бележки, намерени � \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Вече �те влезли."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Вече �те абонирани!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "�аи�тина ли и�кате да изтриете тази бележка?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Одобр�ване на абонамента"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "�втоматично влизане занапред. Да не �е ползва на общи компютри!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -404,15 +474,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "�ватар"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "�ватарът е обновен."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -422,6 +496,7 @@ msgstr ""
 "�ъобщение � ин�трукции. (Добавихте ли %s в �пи�ъка �и там?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -430,7 +505,7 @@ msgstr ""
 "�пам) за �ъобщение � указани�."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очаква �е потвърждение за този телефонен номер."
 
@@ -441,6 +516,8 @@ msgstr "Преди »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "За мен"
 
@@ -448,16 +525,18 @@ msgstr "За мен"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "�втобиографи�та е твърде дълга (до 140 �имвола)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Грешка при изтриване на бележката."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Грешка при четене адре�а на аватара '%s'"
@@ -465,6 +544,8 @@ msgstr "Грешка при четене адре�а на аватара '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Грешка при запазване на новата парола."
 
@@ -472,31 +553,34 @@ msgstr "Грешка при запазване на новата парола."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Отказ"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Грешка при �ъздаване на потребител�ки OpenID обект"
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Грешка при нормализаци� на този Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Грешка при нормализиране адре�а на е-пощата"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Пром�на"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Пром�на обработката на пи�мата"
 
@@ -506,11 +590,12 @@ msgid "Change password"
 msgstr "См�на на паролата"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "См�на на паролата"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Пром�на на�тройките на профила"
 
@@ -520,6 +605,9 @@ msgstr "Пром�на на�тройките на профила"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Потвърждаване"
 
@@ -532,12 +620,14 @@ msgstr "Потвърждаване на адре�а"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Потвърждаването е прекъ�нато."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Код за потвърждение"
 
@@ -546,7 +636,8 @@ msgstr "Код за потвърждение"
 msgid "Confirmation code not found."
 msgstr "Кодът за потвърждение не е открит."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -580,20 +671,24 @@ msgstr ""
 "�амо при�тни мигове!"
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Свързване"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Свързване на �ъще�твуваща �метка"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Контакт"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Грешка при �ъздаване на OpenID форма: %s"
@@ -601,35 +696,39 @@ msgstr "Грешка при �ъздаване на OpenID форма: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Грешка при про�лед�ване на потребител: %s вече е в �пи�ъка ви."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Грешка при прена�очване към �ървър: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Грешка при запазване данните на аватара"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Грешка при запазване на нови� профил"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Грешка при абониране на друг потребител за ва�."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Грешка при абониране."
 
@@ -649,15 +748,17 @@ msgstr "Грешка при преобразуване на tokens за одоб
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Грешка при изтриване на абонамента."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "�е �а открити бележки."
 
@@ -670,29 +771,38 @@ msgstr "�е е получен token за одобрение."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "�е може да �е вмъкне код за потвърждение."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Грешка при добав�не на нов абонамент."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Грешка при запазване на профила."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Грешка при обнов�ване запи�а на потребител."
 
@@ -708,42 +818,48 @@ msgstr "Грешка при обновÑ�ване запиÑ�а на потребÐ
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Грешка при обнов�ване на потребител�."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Създаване"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Създаване на нов потребител � този п�евдоним."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Създаване на нова �метка"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Създаване на нов акаунт за OpenID, който вече има потребител."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Текущ потвърден Jabber/GTalk адре�."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Текущ потвърден телефонен номер за SMS-и."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Текущ потвърден адре� на е-поща."
 
@@ -752,23 +868,27 @@ msgid "Currently"
 msgstr "В момента"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Изтриване на бележката"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Опишете �ебе �и и интере�ите �и в до 140 букви"
 
@@ -776,11 +896,13 @@ msgstr "Опишете �ебе �и и интере�ите �и в до 140 б
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Е-поща"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "�дре� на е-поща"
 
@@ -790,39 +912,43 @@ msgid "Email Settings"
 msgstr "�а�тройки на е-поща"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "�дре�ът на е-поща вече �е използва."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Потвърждаване адре�а на е-поща"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "�дре� на е-поща, като \"UserName@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "�дре�и на е-поща"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Въведете п�евдоним или е-поща."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Въведете кода, който получихте по телефона."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Грешка при одобр�ване на token"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Грешка при �вързване на потребител� към OpenID."
 
@@ -833,39 +959,46 @@ msgstr "Грешка при �вързване на потребител�."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Грешка при вмъкване на аватар"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Грешка при вмъкване на нов профил"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Грешка при вмъкване на отдалечен профил"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Грешка при запазване на потвърждение за адре�"
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Грешка при запазване на отдалечен профил"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Грешка при запазване на профил"
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Грешка при запазване на потребител."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Грешка при запазване на потребител — невалидно�т."
 
@@ -874,6 +1007,9 @@ msgstr "Грешка при запазване на потребител — нÐ
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Грешка в на�тройките на потребител�."
 
@@ -884,6 +1020,7 @@ msgstr "Грешка при обнов�ване на профил"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Грешка при обнов�ване на отдалечен профил"
 
@@ -893,33 +1030,36 @@ msgid "Error with confirmation code."
 msgstr "Грешка в кода за потвърждение."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Съще�твуващ п�евдоним"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "Въпро�и"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "�еу�пешно обнов�ване на аватара."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Еми�и� � при�телите на %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Еми�и� � отговорите към %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Еми�и� за етикета %s"
@@ -934,7 +1074,7 @@ msgstr "Тър�ене в �ъдържанието на бележките"
 msgid "Find people on this site"
 msgstr "Тър�ене на хора в �айта"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -947,6 +1087,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Пълно име"
 
@@ -955,23 +1100,33 @@ msgstr "Пълно име"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Пълното име е твърде дълго (мак�. 255 знака)"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Помощ"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "�ачало"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Лична �траница"
 
@@ -979,21 +1134,27 @@ msgstr "Лична �траница"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "�дре�ът на личната �траница не е правилен URL."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "И�кам да изпращам бележки по пощата."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM адре�"
 
@@ -1003,7 +1164,7 @@ msgid "IM Settings"
 msgstr "IM на�тройки"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1011,7 +1172,7 @@ msgstr ""
 "�ко вече имате �метка, за да � �вържете � OpenID влезте � потребител�ко �и "
 "име и парола."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1019,7 +1180,7 @@ msgstr ""
 "�ко и�кате да добавите OpenID към �метката �и, въведете го в кутийката "
 "отдолу и нати�нете \"Добав�не\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1030,25 +1191,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Вход�ща поща"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Вход�щи�т адре� на е-поща е премахнат."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Грешна �тара парола"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Грешно име или парола."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1057,30 +1224,31 @@ msgstr ""
 "въз�танов�ване на паролата."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "�еправилен адре� на аватар '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "�еправилен адре� на е-поща: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "�еправилен адре� на домашна �траница '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "�еправилен адре� на лиценз '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "�евалидно �ъдържание на бележка"
 
@@ -1095,13 +1263,13 @@ msgid "Invalid notice url"
 msgstr "�еправилен адре� на бележка"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "�еправилен адре� на профил '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "�еправилен адре� на профил (грешен формат)"
 
@@ -1119,28 +1287,35 @@ msgstr "�еправилен размер."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "�еправилно име или парола."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Поканите �а изпратени."
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Изпратени �а покани до �ледните хора:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Покани"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Покани за нови потребители"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1152,11 +1327,12 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Този Jabber ID принадлежи на друг потребител."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1166,12 +1342,14 @@ msgstr ""
 "�те добавили %s в �пи�ъка �и � при�тели в IM или GTalk клиента �и."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Език"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
 
@@ -1180,7 +1358,15 @@ msgstr "Името на езика е твърде дълго (може да е
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Ме�тоположение"
 
@@ -1189,7 +1375,12 @@ msgstr "Ме�тоположение"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Името на ме�тоположението е твърде дълго (мак�. 255 знака)."
 
@@ -1198,18 +1389,22 @@ msgstr "Името на меÑ�тоположението е твърде дълÐ
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Вход"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Влизане � [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1219,22 +1414,26 @@ msgstr ""
 "Влезте � име и парола. ��мате такива? [Реги�трирайте](%%action.register%%) "
 "нова �метка или опитайте � [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Изход"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "По-дълго име, за предпочитане \"и�тин�кото\" ви име."
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Загубена или забравена парола"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Задаване на нова е-поща, от ко�то да �е публикува. Отмен� предишната."
 
@@ -1245,16 +1444,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Управление на пощата, идваща от %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Уча�тник от"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Микроблог на %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1266,42 +1467,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Тек�товете и файловите ми �а до�тъпни под "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "�ово"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "�ов адре� на е-поща за публикщуване в %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "Добавен е нов вход�щ адре� на е-поща."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "�ов п�евдоним"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "�ова бележка"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "�ова парола"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "�овата парола е запазена. Вл�зохте у�пешно."
 
@@ -1311,7 +1520,13 @@ msgstr "�овата парола е запазена. Вл�зохте у�пе
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "П�евдоним"
 
@@ -1320,7 +1535,12 @@ msgstr "П�евдоним"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Опитайте друг п�евдоним, този вече е зает."
 
@@ -1329,49 +1549,60 @@ msgstr "Опитайте друг пÑ�евдоним, този вече е заÐ
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "П�евдонимът може да �ъдържа �амо малки букви, чи�ла и никакво раз�то�ние "
 "между т�х."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Този п�евдоним не е разрешен тук."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "П�евдоним на потребител, когото и�кате да �ледите"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "П�евдоним или е-поща"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "�е"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "��ма Jabber ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "��ма за�вка за одобрение."
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "�е е избран оператор."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "�е е въведен код."
 
@@ -1383,11 +1614,15 @@ msgstr "��ма код за потвърждение."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "��ма �ъдържание!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "�е е въведена е-поща."
 
@@ -1396,7 +1631,9 @@ msgid "No id."
 msgstr "��ма id."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "��ма вход�щ адре� на е-поща."
 
@@ -1407,6 +1644,7 @@ msgstr "ОтдалечениÑ�Ñ‚ Ñ�ървър не е предоÑ�тавил пÑ
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "��ма п�евдоним."
 
@@ -1414,12 +1652,14 @@ msgstr "��ма п�евдоним."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "��ма потвърждени�, очакващи да бъдат отказани."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "�е е въведен телефонен номер."
 
@@ -1429,7 +1669,8 @@ msgid "No profile URL returned by server."
 msgstr "Сървърът не е върнал адре� на профила."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "��ма указана е-поща за този потребител."
 
@@ -1441,7 +1682,7 @@ msgstr "За�вката не е намерена!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "��ма резултати"
 
@@ -1452,12 +1693,16 @@ msgstr "��ма размер."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "�е е открита бележка � такъв идентификатор."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "�е е открита бележка � такъв идентификатор."
 
@@ -1467,13 +1712,15 @@ msgid "No such OpenID."
 msgstr "��ма такъв OpenID-адре�."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "��ма такъв документ."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "��ма такава бележка."
 
@@ -1511,12 +1758,22 @@ msgstr "��ма такъв абонамент"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "��ма такъв потребител"
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "��ма потребител � такава е-поща или потребител�ко име."
 
@@ -1530,32 +1787,38 @@ msgid "Not a recovery code."
 msgstr "Това не е код за въз�танов�ване."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Това не е реги�триран потребител."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "�еподдържан формат на данните"
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "�еправилен Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "�еправилен OpenID"
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Това не е правилен адре� на е-поща."
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "�еправилен адре� на е-поща."
 
@@ -1563,6 +1826,11 @@ msgstr "�еправилен адре� на е-поща."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "�еправилен п�евдоним."
 
@@ -1582,7 +1850,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "�еправилен адре� на профил (н�ма YADIS документ)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Файлът не е изображение или е повреден."
 
@@ -1593,11 +1862,13 @@ msgstr "Забранено."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "�еочакван отговор."
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "�е е открито."
 
@@ -1613,11 +1884,15 @@ msgstr "�е е открито."
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "�е �те влезли в �и�темата."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "�е �те абонирани!"
 
@@ -1634,39 +1909,44 @@ msgid "Notice feed for %s"
 msgstr "Еми�и� � бележки на %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Бележката н�ма профил"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Бележки"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Бележки � етикет %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Стара парола"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "�а�тройки на OpenID"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "�втоматично предаване на OpenID"
 
@@ -1674,29 +1954,34 @@ msgstr "�втоматично предаване на OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "Влизане � OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "Влизането � OpenID е прекратено."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Грешка при влизане � OpenID: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Проблем � OpenID: %s"
@@ -1712,11 +1997,12 @@ msgid "OpenID settings"
 msgstr "�а�тройки на OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Може да добавите и лично �ъобщение към поканата."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Ча�тично качване на файла."
 
@@ -1726,34 +2012,46 @@ msgstr "Ча�тично качване на файла."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Парола"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Паролата и потвърждението й не �ъвпадат."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Паролата тр�бва да е от поне 6 знака."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Пои�кано е въз�танов�ване на парола"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Паролата е запи�ана."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Паролите не �ъвпадат."
 
@@ -1773,14 +2071,17 @@ msgid "People search"
 msgstr "Тър�ене на хора"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Лично"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Лично �ъобщение"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Телефонен номер — � код, без пунктоаци� и без интервали."
 
@@ -1794,7 +2095,7 @@ msgstr ""
 "на този потребител. �ко не и�кате абонамента, нати�нете \"Cancel\" (Отказ)."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Публикуване пром�ната на �ъ�то�нието ми в Jabber/GTalk."
 
@@ -1803,7 +2104,9 @@ msgstr "Публикуване пром�ната на �ъ�то�нието м
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "�а�тройки"
 
@@ -1812,42 +2115,52 @@ msgstr "�а�тройки"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "�а�тройките �а запазени."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Предпочитан език"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Поверително�т"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Проблем при запи�ване на бележката."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Профил"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "�дре� на профила"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "�а�тройки на профила"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "�епознат профил"
 
@@ -1856,17 +2169,19 @@ msgid "Public Stream Feed"
 msgstr "Еми�и� на общи� поток"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Общ поток"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Публикуване на MicroID за адре�а в Jabber/GTalk."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Публикуване на MicroID за адре�а на е-пощата."
 
@@ -1876,12 +2191,14 @@ msgid "Recent Tags"
 msgstr "Скорошни етикети"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Въз�танов�ване"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Въз�танов�ване на паролата"
 
@@ -1894,37 +2211,45 @@ msgstr "Код за възÑ�тановÑ�ване на непознат потрÐ
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Реги�триране"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Запи�ването не е позволено."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Запи�ването е у�пешно."
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Охвърл�не"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Запомни ме"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Отдалечен профил без �ъответ�тващ локален"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Отдалечен абонамент"
 
@@ -1938,6 +2263,9 @@ msgstr "Отдалечен абонамент"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Премахване"
 
@@ -1946,7 +2274,7 @@ msgstr "Премахване"
 msgid "Remove OpenID"
 msgstr "Премахване на OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1955,34 +2283,41 @@ msgstr ""
 "невъзможно. За да го изтриете, първо добавете друг OpenID."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Отговори"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Отговори на %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Обнов�ване"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "�ова парола"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "Телефонен номер за SMS"
 
@@ -1991,17 +2326,18 @@ msgstr "Телефонен номер за SMS"
 msgid "SMS Settings"
 msgstr "�а�тройки за SMS"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "Потвърждение за SMS"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Също като паролата по-горе"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Същото като паролата по-горе. Задължително поле."
 
@@ -2014,12 +2350,21 @@ msgstr "Същото като паролата по-горе. Задължите
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Запазване"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Тър�ене"
 
@@ -2029,7 +2374,7 @@ msgid "Search Stream Feed"
 msgstr "Тър�ене в еми�и�та на потока"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2038,7 +2383,7 @@ msgstr ""
 "Тър�ене на бележки в %%site.name%% по �ъдържанието им. Отдел�йте фразите за "
 "тър�ене (тр�бва да �а по-дълги от 3 �имвола) � интервали."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2048,33 +2393,38 @@ msgstr ""
 "Отдел�йте фразите за "
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Изберете оператор"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Прати"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Изпратете пи�мо до този адре� за публикуване като бележка."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Изпращане на уведомлени� за нови абонаменти по пощата."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Изпращане на бележките по Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2083,15 +2433,18 @@ msgstr ""
 "так�и от оператора."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "Изпращане по Jabber/GTalk на отговори от хора, "
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "�а�тройки"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "�а�тройките �а запазени."
 
@@ -2111,27 +2464,32 @@ msgid "Something weird happened."
 msgstr "Случи �е нещо �транно."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Вход�щата поща не е разрешена."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Това не е ваши�т вход�щ адре�."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Изходен код"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Стати�тики"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "��ма запазен OpenID."
 
@@ -2139,24 +2497,28 @@ msgstr "��ма запазен OpenID."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "�бониране"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "�бонати"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "�бонаментът е одобрен"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "�бонаментът е отказан"
 
@@ -2164,28 +2526,35 @@ msgstr "�бонаментът е отказан"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "�бонаменти"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Си�темна грешка при качване на файл."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Етикети"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Тек�т"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Тър�ене на тек�т"
 
@@ -2205,6 +2574,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Този код за потвърждение не е за ва�!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Тази е-поща вече �е използва от друг потребител."
 
@@ -2214,63 +2584,73 @@ msgid "That file is too big."
 msgstr "Файлът е твърде гол�м."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Това вече е ваши�т Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Това и �ега е адре�ът на е-пощата ви."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Това и �ега е номерът на телефона ви."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Това не е ваши�т Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Това не е ваши�т адре� на е-поща."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Това не е ваши�т телефонен номер."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Грешен IM адре�."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Този код за потвърждение е грешен."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Този телефонен номер вече �е използва от друг потребител."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Твърде дълга бележка. Тр�бва да е най-много 140 знака."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Това е твърде дълго. Тр�бва да е най-много 255 знака."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "�дре�ът \"%s\" е потвърден за �метката ви."
@@ -2279,11 +2659,14 @@ msgstr "�дре�ът \"%s\" е потвърден за �метката ви."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "�дре�ът е премахнат."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2292,7 +2675,8 @@ msgstr ""
 "�бонаментът е одобрен, но не е зададен callback URL. За да завършите "
 "одобр�ването, проверете ин�трукциите на �айта. Ваши�т token за абонамент е:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2302,33 +2686,38 @@ msgstr ""
 "абонамента, проверете ин�трукциите на �айта."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Това �а хората, които четат бележките на %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Tова �а хората, които четат бележките ви."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Хора, чийто бележки %s чете."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "��ма хора, чийто бележки четете."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr "Тези хора �а потребители тук и автоматично �те абонирани за т�х:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Кодът за потвърждение е твърде �тар. Започнете проце�а отново."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2337,7 +2726,7 @@ msgstr ""
 "преминете към OpenID до�тавчика �и нати�нете бутона за изпращане."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2352,6 +2741,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Този метод изи�ква за�вка POST или DELETE."
 
@@ -2360,25 +2752,37 @@ msgstr "Този метод изи�ква за�вка POST или DELETE."
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Този метод изи�ква за�вка POST."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Ча�ови по��"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "�е е избран ча�ови по��"
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2391,18 +2795,21 @@ msgstr ""
 "профила �и в не� по-долу."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Тр�бва да �е дадат два идентификатора или имена на потребители."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "�дре� на личната ви �траница, блог или профил в друг �айт"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "�дре� на профила ви в друга, �ъвме�тима у�луга за микроблогване"
 
@@ -2414,15 +2821,22 @@ msgstr "�дре� на профила ви в друга, �ъвме�тима
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "�еочаквано изпращане на форма."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "�еочаквано поднов�ване на паролата."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "�епознато дей�твие"
 
@@ -2453,38 +2867,47 @@ msgstr "Отпи�ване"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "�еподдържана вер�и� на OMB"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Форматът на файла � изображението не �е поддържа."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Бележки през SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Бележки през ме�инджър (IM)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Бележки от %1$s и при�тели в %2$s."
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Качване"
 
@@ -2505,6 +2928,7 @@ msgid "Upload a new profile image"
 msgstr "Качване на нова �нимка за профила"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -2512,7 +2936,9 @@ msgstr ""
 "у�лугата на �айта."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Използва �е �амо за промени, об�ви или въз�танов�ване на паролата"
 
@@ -2536,11 +2962,16 @@ msgstr "Потребител�т, когото про�лед�вате, не �
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Потребител�т н�ма профил."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Потребител�ки п�евдоним"
 
@@ -2549,29 +2980,33 @@ msgid "User not found."
 msgstr "Потребител�т не е открит."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "В кой ча�ови по�� �те обикновено?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Какво �тава, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Къде �е намирате (град, община, държава и т.н.)"
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Грешен вид изображение за '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Грешен размер на изображението '%s'"
@@ -2579,7 +3014,9 @@ msgstr "Грешен размер на изображението '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Да"
 
@@ -2600,11 +3037,12 @@ msgid "You are already logged in!"
 msgstr "Вече �те влезли!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Вече �те абонирани за �ледните потребители:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "С указани� потребител не �те запи�ани като при�тели."
 
@@ -2622,7 +3060,7 @@ msgstr "Първо �е реги�трирайте, за да започнете
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Може да получавате на е-пощата �и SMS-�ъобщени� от %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
@@ -2631,6 +3069,7 @@ msgstr ""
 "\"Премахване\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2639,7 +3078,8 @@ msgstr ""
 "Можете да получавате �ъобщени� по Jabber/GTalk [instant messages](%%doc.im%"
 "%). Въведете адре�а �и в на�тройките по-долу."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "Можете да обновите лични� �и профил, за да зна�т хората повече за ва�."
@@ -2648,21 +3088,23 @@ msgstr "Можете да обновите лични� �и профил, за
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Можете да ползвате локален абонамент!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "�е можете да �е реги�трате, ако не �те �ъгла�ни �  лиценза."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "�е �те ни изпратили този профил"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2676,16 +3118,19 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "�е може да изтривате бележки на друг потребител."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "За да каните хора в %s, тр�бва да �те влезли."
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2693,20 +3138,21 @@ msgstr ""
 "Ще ви уведомим при приемане на покана и запи�ване в �айта. Благодарим ви за "
 "увеличаването на общно�тта тук!"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Разпознати �те. Въведете паролата �и по-долу. "
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "Ваши�т OpenID URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "П�евдонимът ви на този �ървър или е-пощата, � ко�то �те реги�трирани."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2715,47 +3161,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) ви позвол�ва влизане в различни �айтове � един и "
 "�ъщ акаунт. От тук �е управл�ват �ъответните OpenID."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "преди н�колко �екунди"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "преди около %d дни"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "преди около %d ча�а"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "преди около %d минути"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "преди около %d ме�еца"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "преди около ден"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "преди около минута"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "преди около ме�ец"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "преди около година"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "преди около ча�"
 
@@ -2777,12 +3233,14 @@ msgid "reply"
 msgstr "отговор"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "�ъщо като паролата по-горе"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "неподдържан вид файл"
 
@@ -2803,6 +3261,26 @@ msgstr "« След"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Имаше проблем �ъ� �е�и�та ви в �айта. Мол�, опитайте отново!"
 
@@ -2811,6 +3289,7 @@ msgid "This notice is not a favorite!"
 msgstr "Тази бележка не е отбел�зана като любима!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Грешка при изтриване на любима бележка."
 
@@ -2818,22 +3297,28 @@ msgstr "Грешка при изтриване на любима бележка.
 msgid "Favor"
 msgstr "Любимо"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Изпращане на пи�мо при отбел�зване на мо� бележка като любима."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Изпращане на пи�мо при ново лично �ъобщение."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Тази бележка вече е отбел�зана като любима!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Грешка при отбел�зване като любима."
 
@@ -2843,11 +3328,13 @@ msgstr "�елюбимо"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s любими бележки"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Еми�и� � любимите бележки на %s"
@@ -2889,23 +3376,32 @@ msgid "Login with your username and password. "
 msgstr "Влезте � името и паролата �и. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Твърде дълго. Може да е най-много 140 знака."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "�е е указан получател."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "�е може да изпращате �ъобщени� до този потребител."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2913,11 +3409,13 @@ msgstr ""
 "тихичко."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "��ма такъв потребител"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "�ово �ъобщение"
 
@@ -2971,6 +3469,11 @@ msgstr "Можете а обновите личните �и данни тук "
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Потребител без �ъответ�тващ профил"
 
@@ -2999,6 +3502,8 @@ msgid "New password successfully saved. "
 msgstr "�овата парола е запи�ана. "
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Паролата тр�бва да е 6 или повече знака."
 
@@ -3019,12 +3524,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Еми�и� � любимите бележки на %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Грешка при изтегл�не на любимите бележки"
 
@@ -3032,7 +3540,7 @@ msgstr "Грешка при изтеглÑ�не на любимите бележÐ
 msgid "No such message."
 msgstr "��ма такова �ъобщение"
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Само подател�т и получател�т могат да четат това �ъобщение."
 
@@ -3056,53 +3564,72 @@ msgid "Mobile carrier for your phone. "
 msgstr "Мобилен оператор на телефона ви."
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Преки �ъобщени� до %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "В�ички преки �ъобщени�, изпратени до %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Изпратени от ва� преки �ъобщени�"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "В�ички преки �ъобщени�, изпратени от %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Лип�ва тек�т на �ъобщението"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Получател�т не е открит"
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "�е може да изпращате преки �ъобщени� до хора, които не �а в �пи�ъка ви � "
 "при�тели."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Отбел�зани като любими от %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s бележки отбел�зани като любими от %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s отбел�за бележката ви като любима"
@@ -3125,14 +3652,17 @@ msgstr ""
 "там."
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "�а�тройки за Twitter"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Профил в Twitter"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Текущ проверен профил в Twitter"
 
@@ -3141,6 +3671,7 @@ msgid "Twitter Username"
 msgstr "Име в Twitter"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Без интервали, мол�!"
 
@@ -3149,18 +3680,22 @@ msgid "Twitter Password"
 msgstr "Парола за Twitter"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "�втоматично препращане на бележките ми към Twitter"
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Препращане на локалните отговори � \"@\" и към Twitter"
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "�бониране за при�телите ми от Twitter тук"
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3169,6 +3704,7 @@ msgstr ""
 "черта. Може да е най-много 15 знака."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "Грешка при �вер�ване на данните ви � Twitter"
 
@@ -3179,33 +3715,43 @@ msgstr "Грешка при извличане данните на профилÐ
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "Грешка при запи�ване на�тройките за Twitter"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "�а�тройките за Twitter �а запазени."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Това не е ваши�т профил в Twitter."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "Грешка при премахване на профила от Twitter"
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Профилът от Twitter е премахнат."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "Грешка при запи�ване на�тройките за Twitter"
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "�а�тройките за Twitter �а запазени."
 
@@ -3222,18 +3768,19 @@ msgid "The subscription has been rejected, but no "
 msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Резултат от командата"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Командата е изпълнена"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Грешка при изпълнение на командата"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "За �ъжаление тази команда в�е още не �е поддържа."
 
@@ -3243,90 +3790,112 @@ msgid "Subscriptions: %1$s\n"
 msgstr "�бонаменти: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "Потребител�т н�ма по�ледна бележка"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Бележката е отбел�зана като любима."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Пълно име: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Ме�тоположение: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна �траница: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Отно�но: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 "Съобщението е твърде дълго. �ай-много може да е 140 знака, а �те въвели %d."
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Пр�кото �ъобщение до %s е изпратено."
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Грешка при изпращане на пр�кото �ъобщение"
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Уточнете името на потребител�, за когото �е абонирате."
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "�бонирани �те за %s."
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Уточнете името на потребител�, от когото �е отпи�вате."
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Отпи�ани �те от %s."
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Командата в�е още не �е поддържа."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Уведомлението е изключено."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "Грешка при изключване на уведомлението."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Уведомлението е включено."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Грешка при включване на уведомлението."
 
@@ -3334,11 +3903,11 @@ msgstr "Грешка при включване на уведомлението."
 msgid "Commands:\n"
 msgstr "Команди:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "Грешка при вмъкване на �ъобщението."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "Грешка при обнов�ване на бележката � нов URL-адре�."
 
@@ -3353,7 +3922,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "�ово лично �ъобщение от %s"
@@ -3367,7 +3936,7 @@ msgstr ""
 "%1$s (%2$s) ви изпрати лично �ъобщение:\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "Само потребител�т може да отвар� �об�твената �и кути�."
 
@@ -3376,31 +3945,39 @@ msgid "This form should automatically submit itself. "
 msgstr "Тази форма �ама ще �е изпрати автоматично."
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Любими"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Любими бележки на %s"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Потребител"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Вход�щи"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Получените от ва� �ъобщени�"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Изход�щи"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Изпратените от ва� �ъобщени�"
 
@@ -3413,14 +3990,19 @@ msgid "Twitter integration options"
 msgstr "�а�тройки за интеграци� � Twitter"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "До"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "Грешка при обработка на �ъобщението"
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s и при�тели, �траница %d"
@@ -3430,21 +4012,31 @@ msgid "You can upload your personal avatar."
 msgstr "Можете да качите личен аватар тук."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "�а�тройки за аватар"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Оригинал"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Преглед"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Изр�зване"
 
@@ -3462,35 +4054,44 @@ msgid "There was a problem with your session token. "
 msgstr "Имаше проблем �ъ� �е�и�та ви в �айта. Мол�, опитайте отново!"
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Изберете квадратна обла�т от изображението за аватар"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "��ма такава бележка."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "�еподдържан вид файл"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "�е е указан профил."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "�е е открит профил � такъв идентификатор."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Блокиране на потребител�"
 
@@ -3498,11 +4099,11 @@ msgstr "Блокиране на потребител�"
 msgid "Are you sure you want to block this user? "
 msgstr "�аи�тина ли и�кате да блокирате този потребител? "
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Вече �те блокирали този потребител."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "Грешка при запи�ване данните за блокирането."
 
@@ -3519,38 +4120,56 @@ msgstr "Ще изтриете напълно бележката. "
 msgid "Add to favorites"
 msgstr "Добав�не към любимите"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "За да �ъздавате група, тр�бва да �те влезли."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "��ма п�евдоним."
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "��ма такава група."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "За да редактирате групата, тр�бва да �те й админи�тратор."
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3562,15 +4181,16 @@ msgstr ""
 "между т�х."
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "�втобиографи�та е твърде дълга (до 140 �имвола)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "Грешка при обнов�ване на групата."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "�а�тройките �а запазени."
 
@@ -3589,7 +4209,8 @@ msgstr "�ов адре� на е-поща за публикщуване в %s"
 msgid "Send me email when someone "
 msgstr "Изпращане на пи�мо при ново лично �ъобщение."
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3605,7 +4226,7 @@ msgstr ""
 "�а ме�инджъра ви е изпратен код за потвърждение. За да получавате �ъобщени� "
 "от %s, тр�бва да го одобрите."
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3619,52 +4240,67 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Пропу�кане"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "��ма �ъдържание!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Страниране"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "След"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "Преди"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Благодарим ви, че поканихте при�тели да ползват %s!"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "Изпратени �а покани до �ледните хора:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, fuzzy, php-format
 msgid "You have been invited to %s"
 msgstr "\"Побутване\" от %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "Еми�и� � при�телите на %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Изпращане на покани"
@@ -3708,13 +4344,15 @@ msgstr ""
 msgid "Sync preferences"
 msgstr "Синхронизиране на на�тройките"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 #, fuzzy
 msgid "Disfavor favorite"
 msgstr "�елюбимо"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Попул�рни бележки"
 
@@ -3728,7 +4366,8 @@ msgid "The most popular notices on the site right now."
 msgstr "�ай-попул�рните бележки в момента в �айта."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Избрани потребители"
 
@@ -3742,15 +4381,17 @@ msgstr "Избрани потребители, �траница %d"
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Потребител�т е забранил да �е абонирате за него."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "Лип�ва ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Лого на групата"
 
@@ -3758,11 +4399,13 @@ msgstr "Лого на групата"
 msgid "You can upload a logo image for your group."
 msgstr "Може да качите лого за групата ви."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Лотого е обновено."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "�еу�пешно обнов�ване на логото."
 
@@ -3781,7 +4424,8 @@ msgid "A list of the users in this group."
 msgstr "Спи�ък � потребителите в тази група."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Групи"
 
@@ -3796,6 +4440,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "Създаване на нова група"
 
@@ -3805,7 +4450,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr "Тър�ене на групи в %%site.name%% по име, ме�тоположение или опи�ание."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Тър�ене на групи"
 
@@ -3828,20 +4473,20 @@ msgstr "Изпращане на бележките по Jabber/GTalk "
 msgid "A confirmation code was sent "
 msgstr "��ма код за потвърждение."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "За да �е при�ъедините към група, тр�бва да �те влезли."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "Вече членувате в тази група."
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s �е при�ъедини към групата %s"
@@ -3850,15 +4495,18 @@ msgstr "%s �е при�ъедини към групата %s"
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "За напу�нете група, тр�бва да �те влезли."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "��ма такава група"
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "�е членувате в тази група."
 
@@ -3867,22 +4515,26 @@ msgstr "�е членувате в тази група."
 msgid "You may not leave a group while you are its administrator."
 msgstr "�е може да изтривате бележки на друг потребител."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 #, fuzzy
 msgid "Could not find membership record."
 msgstr "Грешка при обнов�ване запи�а на потребител."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -3894,15 +4546,17 @@ msgstr ""
 msgid "New group"
 msgstr "�ова група"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "Използвайте тази бланка за �ъздаване на нова група."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "Грешка при �ъздаване на групата."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Грешка при �ъздаване на нов абонамент."
@@ -3916,12 +4570,15 @@ msgstr "Това е твърде дълго. "
 msgid "Don't send a message to yourself; "
 msgstr "�е може да изпращате �ъобщени� до този потребител."
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 #, fuzzy
 msgid "Notice posted"
 msgstr "Бележки"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Грешка в Ajax"
 
@@ -3938,7 +4595,7 @@ msgstr "Побутването е изпратено"
 msgid "Nudge sent!"
 msgstr "Побутването е изпратено!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "Влизане � OpenID"
@@ -3964,11 +4621,13 @@ msgstr "�втоматично �ъкращаване на адре�и"
 msgid "Service"
 msgstr "У�луга"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "У�луга за автоматично �ъкращаване, ко�то да �е ползва."
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "У�лугата за �ъкращаване е твърде дълга (може да е до 50 знака)."
 
@@ -3976,17 +4635,18 @@ msgstr "У�лугата за �ъкращаване е твърде дълга
 msgid "Change your password."
 msgstr "См�на на паролата."
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "Паролата е запи�ана."
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Това не е правилен адре� на е-поща."
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -3996,11 +4656,12 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Данни на профила"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4013,20 +4674,25 @@ msgstr ""
 "ботове)."
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "�еправилен етикет: \"%s\""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "Грешка при запазване етикетите."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Общ поток, �траница %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Грешка при изтегл�не на общи� поток"
 
@@ -4047,11 +4713,13 @@ msgstr "Еми�и� на общи� поток"
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4107,7 +4775,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Отговори на %s, �траница %d"
@@ -4117,51 +4786,72 @@ msgstr "Отговори на %s, �траница %d"
 msgid "%s favorite notices, page %d"
 msgstr "Любими бележки на %s, �траница %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Профил на групата"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "Бележки"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "Еми�и� � бележки на %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Членове"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "В�ички членове"
 
@@ -4177,7 +4867,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr "Само подател�т и получател�т могат да четат това �ъобщение."
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, �траница %d"
@@ -4188,30 +4878,37 @@ msgid "'s profile"
 msgstr "Профил на "
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "Потребител�ки профил"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Снимка"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "Потребител�ки дей�тви�"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "Изпращате на пр�ко �ъобщение до този потребител."
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Съобщение"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "В�ички абонати"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "В�ички групи"
 
@@ -4237,7 +4934,7 @@ msgstr "Изпращане на бележките по Jabber/GTalk."
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Очаква �е потвърждение за този телефонен номер."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Мобилен оператор"
 
@@ -4300,16 +4997,17 @@ msgstr "Хора, чийто бележки %s чете."
 msgid "These are the people whose "
 msgstr "Това �а хората, които четат бележките на %s."
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Бележки � етикет %s, �траница %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4334,7 +5032,7 @@ msgstr "Етикети"
 msgid "Tag user"
 msgstr "Етикети"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4344,16 +5042,16 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "Имаше проблем �ъ� �е�и�та ви в �айта."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Грешка при запазване на етикетите."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4361,20 +5059,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "��ма такъв етикет."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "Бележки � етикет %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "�е е открито."
 
@@ -4385,15 +5086,16 @@ msgstr ""
 "Добав�не на профила ви в Twitter за автоматично препращане на бележките ви и "
 "там."
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Име в Twitter"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Парола за Twitter"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "При�тели от Twitter"
 
@@ -4406,153 +5108,162 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr "Грешка при извличане данните на профила \"%s\" от Twitter."
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "Грешка при запазване на потребител."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "Сървърът не е върнал адре� на профила."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 #, fuzzy
 msgid "No profile with that id."
 msgstr "�е е открита бележка � такъв идентификатор."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Отпи�ване"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "Групи на %s"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Групи на %s, �траница %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Грешка при запи�ване на бележката. �епознат потребител."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
 "отново �лед н�колко минути."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Забранено ви е да публикувате бележки в този �айт."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Качване на аватар"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Друго"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Други на�тройки"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "�еозаглавена �траница"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Тър�ене за хора или бележки"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Сметка"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Пром�на на поща, аватар, парола, профил"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Свързване към моментни �ъобщени�, SMS, Twitter"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Излизане от �айта"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Влизане в �айта"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Създаване на нова �метка"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "Влизане � OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "Помощ"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "�ова бележка"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "�ова бележка"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "�бонаменти"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Лиценз на програмата StatusNet"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "В�ички "
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "лиценз."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "Блокиране на потребител�"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Блокиране"
 
@@ -4566,12 +5277,15 @@ msgstr "%s любими бележки"
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "Създаване на нова �метка"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "Публикувано"
 
@@ -4591,53 +5305,59 @@ msgstr "Филтриране на етикетите"
 msgid "All"
 msgstr "В�ички"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Етикет"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Изберете етикет за конкретизиране"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "�дре� на �траница, блог или профил в друг �айт на групата"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Опи�ание"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Опишете групата или темата й в до 140 букви"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Къде �е намира групата — град, община, държава и т.н. (ако е приложимо)"
+msgstr ""
+"Къде �е намира групата — град, община, държава и т.н. (ако е приложимо)"
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Група"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Редактиране на�тройките на групата %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Лого"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Добав�не или редактиране логото на %s"
@@ -4668,11 +5388,11 @@ msgstr "При�ъедин�ване"
 msgid "Leave"
 msgstr "�апу�кане"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Вход � име и парола"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Създаване на нова �метка"
 
@@ -4694,17 +5414,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s вече получава бележките ви в %2$s."
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Ме�тоположение: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Лична �траница: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4713,7 +5433,7 @@ msgstr ""
 "Биографи�: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Побутнати �те от %s"
@@ -4728,39 +5448,47 @@ msgstr "%1$s (%2$s) �е чуди � какво �е занимавате нап
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s току-що отбел�за като любима бележката ви от %2$s."
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "От"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Изпращане на пр�ко �ъобщеие"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "Изпращане на бележка"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "�алични знаци"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "в отговор на"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Отговар�не на тази бележка"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Отговор"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Изтриване на бележката"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -4781,27 +5509,29 @@ msgstr "Побутване на този потребител"
 msgid "Tags in %s's notices"
 msgstr "Етикети в бележките на %s"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(н�ма)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Общ поток"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Скорошни етикети"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Избрано"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Попул�рно"
 
@@ -4817,31 +5547,33 @@ msgstr "Тър�ене на групи в �айта"
 msgid "Untitled section"
 msgstr "�еозаглавен раздел"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "�бонаменти на %s"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "�бонирани за %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Групи, в които уча�тва %s"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Поканете при�тели и колеги да �е при�ъедин�т към ва� в %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Потребител�т ви е блокирал."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "�бониране за този потребител"
 
@@ -4854,10 +5586,11 @@ msgid "Top posters"
 msgstr "�ай-че�то пишещи"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Разблокиране на този потребител"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Разблокиране"
 
@@ -4865,56 +5598,2049 @@ msgstr "Разблокиране"
 msgid "Unsubscribe from this user"
 msgstr "Отпи�ване от този потребител"
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Еми�и� � при�телите на %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Еми�и� � при�телите на %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Еми�и� � при�телите на %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s и при�тели"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Можете да качите личен аватар тук."
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "�ватарът е обновен."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 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:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Имаше проблем �ъ� �е�и�та ви в �айта. Мол�, опитайте отново!"
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Изпращане на пи�мо при ново лично �ъобщение."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Може да качите лого за групата ви."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Изберете квадратна обла�т от изображението за аватар"
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Микроблог на %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Тър�ене на хора в %%site.name%% по техните име, м��то или интере�и. "
+"Отдел�йте фразите за "
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Грешка при изпращане на пр�кото �ъобщение"
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Тър�ене на \"%s\" в потока"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"За по-гол�ма �игурно�т, мол� въведете отново потребител�кото �и име и парола "
+"при пром�на на на�тройките."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Еми�и� на общи� поток"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Еми�и� на общи� поток"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Еми�и� на общи� поток"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr " о�вен тези лични данни: парола, е-поща, ме�инджър, телефон."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Създаване"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Профил на групата"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "Профил на "
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Изход�ща кути� за %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "�ватар"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "�а�тройки на профила"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"�а телефонни� номер, който �те въвели, беше изпратен код за потвърждение. "
+"Проверете �ъобщени�та (или папката за �пам) за кода и указани�та за "
+"използването му."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "��ма такъв потребител"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Добав�не на профила ви в Twitter за автоматично препращане на бележките ви и "
+"там."
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Грешка при извличане данните на профила \"%s\" от Twitter."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"Проверете тези детайли и �е уверете, че и�кате да �е абонирате за бележките "
+"на този потребител. �ко не и�кате абонамента, нати�нете \"Cancel\" (Отказ)."
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Тър�ене за хора или бележки"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
+"отново �лед н�колко минути."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Свързване към моментни �ъобщени�, SMS, Twitter"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Побутване"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"�ко вече имате �метка, за да � �вържете � OpenID влезте � потребител�ко �и "
+"име и парола."
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s вече получава бележките ви в %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"С уважение,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Тър�ене"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "��ма такъв документ."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Спи�ък � потребителите в тази група."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Спи�ък � потребителите в тази група."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Потребител�ки профил"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s и при�тели, �траница %d"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Спи�ък � потребителите в тази група."
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Разблокиране на този потребител"
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Код за потвърждение"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Грешка при изтриване на бележката."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "�еправилен етикет: \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Опитайте друг п�евдоним, този вече е зает."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Грешка при отбел�зване като любима."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "�ова бележка"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "�ова бележка"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "�еправилен п�евдоним."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "�е е указан профил."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Потребител�т ви е блокирал."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "�е членувате в тази група."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Блокиране на потребител�"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "За да �ъздавате група, тр�бва да �те влезли."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Групи"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Грешка при обнов�ване на потребител�."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Грешка при запи�ване на�тройките за Twitter"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "�а�тройките �а запазени."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "За да редактирате групата, тр�бва да �те й админи�тратор."
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "��ма резултати"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Потребител�т ви е блокирал."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Съобщение"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Грешка при запазване на профила."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) ви позвол�ва влизане в различни �айтове � един и "
+"�ъщ акаунт. От тук �е управл�ват �ъответните OpenID."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "�а�тройки на профила"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've 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
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Разпознати �те. Въведете паролата �и по-долу. "
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Пои�кано е въз�танов�ване на парола"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Грешка в кода за потвърждение."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "�бониране за този потребител"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Любими бележки на %s, �траница %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "��ма такъв потребител"
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Бележки � етикет %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s вече получава бележките ви в %2$s."
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Тази бележка вече е отбел�зана като любима!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Тази бележка не е отбел�зана като любима!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Грешка при изтегл�не на общи� поток"
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "�е е указан получател."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "�е �а открити бележки."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Реплики на %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Бележки от %1$s в %2$s."
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "лиценз."
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "�бонаменти на %s"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "�а�тройки на профила"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "�е членувате в тази група."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Проблем при запи�ване на бележката."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Съобщение до %1$s в %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Потребител�ки профил"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Профил"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Качване"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "См�на на паролата"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Свързване"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Тър�ене"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Спи�ък"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Блокиране"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Блокиране на потребител�"
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Добав�не или редактиране логото на %s"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "��ма �ъдържание!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Потребител"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Тър�ене"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "�дре�ът на личната �траница не е правилен URL."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
 #, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "Командата в�е още не �е поддържа."
+msgid "No such page"
+msgstr "��ма такъв етикет."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Преки �ъобщени� до %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Твърде дълго. Може да е най-много 140 знака."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "�втобиографи�та е твърде дълга (до 140 �имвола)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Вече членувате в тази група."
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "�е членувате в тази група."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Групи на %s"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Групи, в които уча�тва %s"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Тър�ене на групи в �айта"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "�ватарът е обновен."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Твърде дълга бележка. Тр�бва да е най-много 140 знака."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Форматът на файла � изображението не �е поддържа."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Снимка"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "�втобиографи�та е твърде дълга (до 140 �имвола)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Бележки от %1$s в %2$s."
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Потребител�т, когото про�лед�вате, не �ъще�твува. "
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Забранено."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Грешка при преобразуване на tokens за одобрение в tokens за до�тъп."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "�епозната вер�и� на протокола OMB."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "��ма такава бележка."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "��ма такава бележка."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Бележки от %1$s в %2$s."
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Влезте � име и парола. ��мате такива? [Реги�трирайте](%%action.register%%) "
+"нова �метка или опитайте � [OpenID](%%action.openidlogin%%). "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Бележки от %1$s в %2$s."
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "В�ички бележки, намерени � \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Свързване"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Опишете �ебе �и и интере�ите �и в до 140 букви"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Опишете �ебе �и и интере�ите �и в до 140 букви"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "�втобиографи�та е твърде дълга (до 140 �имвола)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "�еправилен адре� на профил (н�ма YADIS документ)."
+
+#: 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 "�е е получен token за одобрение."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Съобщение до %1$s в %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Еми�и� � при�телите на %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Еми�и� � при�телите на %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Еми�и� � при�телите на %s"
 
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Изход�ща кути� за %s"
+
+#: actions/shownotice.php:90
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Създаване на нова �метка"
+msgid "Notice deleted."
+msgstr "Бележки"
 
+#: actions/smssettings.php:91
 #, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Грешка при изтриване потвърждението по е-поща."
+msgid "SMS is not available."
+msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Еми�и� � бележки на %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Проверете тези детайли и �е уверете, че и�кате да �е абонирате за бележките "
+"на този потребител. �ко не и�кате абонамента, нати�нете \"Cancel\" (Отказ)."
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"�бонаментът е одобрен, но не е зададен callback URL. За да завършите "
+"одобр�ването, проверете ин�трукциите на �айта. Ваши�т token за абонамент е:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"�бонаментът е отказан, но не е зададен callback URL. За да откажете напълно "
+"абонамента, проверете ин�трукциите на �айта."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Грешка при четене адре�а на аватара '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Грешен вид изображение за '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Грешка при прена�очване към �ървър: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Лиценз на програмата StatusNet"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Грешка при обнов�ване на потребител � потвърден email адре�."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Побутването е изпратено"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+"Съобщението е твърде дълго. �ай-много може да е 140 знака, а �те въвели %d."
 
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+"Съобщението е твърде дълго. �ай-много може да е 140 знака, а �те въвели %d."
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Отговар�не на тази бележка"
+
+#: lib/command.php:441
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "�аи�тина ли и�кате да изтриете тази бележка?"
+msgid "Error saving notice."
+msgstr "Проблем при запи�ване на бележката."
 
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Тър�ене в �ъдържанието на бележките"
+msgid "No configuration file found. "
+msgstr "��ма код за потвърждение."
 
-#~ msgid "List"
-#~ msgstr "Спи�ък"
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
 
-#~ msgid "Icons"
-#~ msgstr "Икони"
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Влизане в �айта"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Изберете оператор"
 
+#: lib/groupeditform.php:168
 #, fuzzy
-#~ msgid ""
-#~ "Hey, %s.\n"
-#~ "\n"
-#~ "Someone just entered this email address on %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Здравей %s.\n"
-#~ "\n"
-#~ "Друг потребител вече въведе този email адре� на %s.\n"
-#~ "\n"
+msgid "Describe the group or topic"
+msgstr "Опишете групата или темата й в до 140 букви"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "�е може да �е потвърди електронната поща."
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Опишете групата или темата й в до 140 букви"
 
-#~ msgid "Email address"
-#~ msgstr "�дре� на е-поща"
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "�ова бележка"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Грешка при вмъкване на бележка"
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s отбел�за бележката ви като любима"
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "�ко �те забравили или изгубили паролата �и, може да ви бъде изпратена "
-#~ "нова на е-пощата, запи�ана в �метката ви."
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " от "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Грешка при изтегл�не на общи� поток"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Изтриване на бележката"
diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo
index aadf38da9..3d48e40e3 100644
--- a/locale/ca/LC_MESSAGES/statusnet.mo
+++ b/locale/ca/LC_MESSAGES/statusnet.mo
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 44944c8ba..2ae3ba293 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -1,30 +1,29 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Catalan
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-06-12 09:18+0000\n"
-"Last-Translator: animarval <animarval@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:42:59+0000\n"
+"Language-Team: Catalan\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Cerca \"%s\" al flux"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -37,17 +36,19 @@ msgid " from "
 msgstr " de "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Notificacions contestant a %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s t'ha convidat us ha convidat a unir-te al grup %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -83,8 +84,8 @@ msgstr ""
 "que conegueu i gent que us interessi.\n"
 "\n"
 "Podeu també compartir notícies sobre vosaltres mateixos, el que penseu, o la "
-"vostra vida a la xarxa amb gent que conegueu. És també força bo per "
-"conèixer nova gent amb qui compartir els vostres interessos.\n"
+"vostra vida a la xarxa amb gent que conegueu. És també força bo per conèixer "
+"nova gent amb qui compartir els vostres interessos.\n"
 "\n"
 "%1$s said:\n"
 "\n"
@@ -99,11 +100,13 @@ msgstr ""
 "\n"
 "%6$s\n"
 "\n"
-"If not, you can ignore this message. Thanks for your patience and your time.\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
 "\n"
 "Sincerely, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ara està escoltant els teus avisos a %2$s."
@@ -126,25 +129,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "estat de %1$s a %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "Flux públic de %s"
@@ -154,34 +160,48 @@ msgstr "Flux públic de %s"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s i amics"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s línia temporal pública"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s estat"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s línia temporal"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s notificacions de tots!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -189,7 +209,8 @@ msgstr ""
 "(Hauries de rebre un missatge per correu electrònic d'aquí uns moments, amb "
 "instruccions sobre com confirmar la teva direcció de correu electrònic.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -198,7 +219,8 @@ msgstr ""
 "**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%"
 "site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** és un servei de microblogging."
@@ -211,32 +233,36 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 lletres en minúscula o números, sense signes de puntuació o espais"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 lletres en minúscula o números, sense puntuacions ni espais. Requerit."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 o més caràcters"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o més caràcters, i no te n'oblidis!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 o més caràcters. Requerit."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -246,6 +272,7 @@ msgstr ""
 "has afegit. Has d'acceptar que %s et pugui enviar missatges."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -281,7 +308,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "No s'ha trobat el mètode API!"
 
@@ -304,16 +358,23 @@ msgstr "No s'ha trobat el mètode API!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "Mètode API en construcció."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Sobre"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Acceptar"
 
@@ -324,6 +385,9 @@ msgstr "Acceptar"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Afegir"
 
@@ -341,27 +405,29 @@ msgstr "Afegir o eliminar OpenIDs"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Adreça"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Direccions d'amic per convidar (una per línia)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Totes les subscripcions"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Totes les actualitzacions per a %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Totes les actualitzacions que corresponen a la frase a cercar \"%s\" "
@@ -371,32 +437,39 @@ msgstr "Totes les actualitzacions que corresponen a la frase a cercar \"%s\" "
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Ja estàs connectat."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Ja estàs subscrit!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "N'estàs segur que vols eliminar aquesta notificació?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autoritzar subscripció"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sessió automàticament en el futur; no utilitzar en ordinadors "
 "compartits!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -406,15 +479,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Avatar actualitzat."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -425,6 +502,7 @@ msgstr ""
 "llista d'amics?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -433,7 +511,7 @@ msgstr ""
 "carpeta de spam!) per al missatge amb les instruccions."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Esperant confirmació per aquest número de telèfon."
 
@@ -444,6 +522,8 @@ msgstr "Anterior »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Biografia"
 
@@ -451,16 +531,18 @@ msgstr "Biografia"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "La biografia és massa llarga (màx. 140 caràcters)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "No es pot esborrar la notificació."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "No es pot llegir l'URL de l'avatar '%s'"
@@ -468,6 +550,8 @@ msgstr "No es pot llegir l'URL de l'avatar '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "No es pot guardar la nova contrasenya."
 
@@ -475,31 +559,34 @@ msgstr "No es pot guardar la nova contrasenya."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Cancel·lar"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Impossible crear una instància de l'objecte OpenID"
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossible normalitzar aquest Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "No es pot normalitzar aquesta direcció de correu electrònic"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Canviar"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Canviar correu electrònic"
 
@@ -509,11 +596,12 @@ msgid "Change password"
 msgstr "Canviar contrasenya"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Canviar la teva contrasenya"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Canviar les preferències del teu perfil"
 
@@ -523,6 +611,9 @@ msgstr "Canviar les preferències del teu perfil"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -535,12 +626,14 @@ msgstr "Confirmar adreça"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Confirmació cancel·lada."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Codi de confirmació"
 
@@ -549,7 +642,8 @@ msgstr "Codi de confirmació"
 msgid "Confirmation code not found."
 msgstr "Codi de confirmació no trobat. "
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -574,28 +668,31 @@ msgstr ""
 "publicar les notificacions a través de missatgeria instantània.\n"
 "* [Buscar gent](%%%%action.peoplesearch%%%%) que puguis conèixer o que "
 "comparteixi els teus interessos. \n"
-"* Actualitzar les [preferències del teu "
-"perfil](%%%%action.profilesettings%%%%) per explicar als demés més sobre tu. "
-"* Llegir els [documents de la xarxa](%%%%doc.help%%%%) per conèixer les "
-"característiques del nostre servei. \n"
+"* Actualitzar les [preferències del teu perfil](%%%%action.profilesettings%%%"
+"%) per explicar als demés més sobre tu. * Llegir els [documents de la xarxa]"
+"(%%%%doc.help%%%%) per conèixer les característiques del nostre servei. \n"
 "\n"
 "Gràcies per registrar-te i esperem que gaudeixis d'aquest servei."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Connectar-se"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Connectar-se a un compte existent"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Posar-se en contacte"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "No s'ha pogut crear el formulari OpenID: %s"
@@ -603,36 +700,40 @@ msgstr "No s'ha pogut crear el formulari OpenID: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 "No pots subscriure't de nou a aquest usuari: %s ja està a la teva llista."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "No pots subscriure't a aquest usuari: L'usuari no existeix."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "No s'ha pogut redirigir al servidor: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "No s'ha pogut guardar la informació de l'avatar"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "No s'ha pogut guardar la informació del nou perfil"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "No pots subscriure a un altre a tu mateix."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "No pots subscriure."
 
@@ -652,15 +753,17 @@ msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "No s'ha pogut eliminar la subscripció."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "No es pot trobar cap estatus."
 
@@ -673,29 +776,38 @@ msgstr "No s'ha pogut obtenir un senyal de petició."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "No s'ha pogut inserir el codi de confirmació."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "No s'ha pogut inserir una nova subscripció."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "No s'ha pogut guardar el perfil."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "No es pot actualitzar l'usuari per autosubscriure."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 
@@ -711,42 +823,48 @@ msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Crear"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Crear un nou usuari amb aquest sobrenom."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Crear nou compte"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Crear nou compte per a un OpenID que ja té un usuari."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Adreça actual Jabber/Gtalk confirmada."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de telèfon actualment confirmat i activat per SMS."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Correu electrònic confirmat actualment."
 
@@ -755,23 +873,27 @@ msgid "Currently"
 msgstr "Actualment"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Hashtag de l'error de la base de dades:%s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Error de BD en inserir resposta: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Eliminar nota."
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
 
@@ -779,11 +901,13 @@ msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Correu electrònic"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Direcció de correu electrònic"
 
@@ -793,39 +917,43 @@ msgid "Email Settings"
 msgstr "Configuració del correu electrònic"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "L'adreça de correu electrònic ja existeix."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmació de l'adreça de correu electrònic"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Correu electrònic, com Email address, like \"UserName@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Direcció de correu electrònic"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Escriu un sobrenom o una adreça de correu electrònic."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Escriu el codi que has rebut en el teu telèfon mòbil."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Error en autoritzar senyal"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Error en connectar usuari a OpenID."
 
@@ -836,39 +964,46 @@ msgstr "Error en connectar usuari."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Error en inserir avatar"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Error en inserir el nou perfil"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Error en inserir perfil remot"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Error en guardar confirmació de l'adreça."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Error en guardar perfil remot"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Error en guardar perfil."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Error en guardar l'usuari."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Error en guardar usuari; invàlid."
 
@@ -877,6 +1012,9 @@ msgstr "Error en guardar usuari; invàlid."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Error en configurar l'usuari."
 
@@ -887,6 +1025,7 @@ msgstr "Error en actualitzar el perfil"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Error en actualitzar el perfil remot"
 
@@ -896,33 +1035,36 @@ msgid "Error with confirmation code."
 msgstr "Error amb el codi de confirmació."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Sobrenom ja existent."
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "Preguntes freqüents"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Error en actualitzar avatar."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed per a amics de %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed per a respostes a %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Feed per a l'etiqueta %s"
@@ -937,7 +1079,7 @@ msgstr "Trobar contingut de les notes"
 msgid "Find people on this site"
 msgstr "Trobar gent en aquest lloc"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -950,6 +1092,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Nom complet"
 
@@ -958,23 +1105,33 @@ msgstr "Nom complet"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Ajuda"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Inici"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Pàgina personal"
 
@@ -982,21 +1139,27 @@ msgstr "Pàgina personal"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Vull publicar notificacions per correu electrònic."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "Missatgeria Instantània"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Adreça de missatgeria instantània"
 
@@ -1006,7 +1169,7 @@ msgid "IM Settings"
 msgstr "Configuració de missatgeria instantània"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1014,7 +1177,7 @@ msgstr ""
 "Si ja tens un compte, inicia una sessió amb el teu nom d'usuari i "
 "contrasenya per a connectar-lo al teu OpenID."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1022,7 +1185,7 @@ msgstr ""
 "Si vols afegir un compte OpenID, introdueix-lo en el camp de sota i clica "
 "\"Afegir\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1033,25 +1196,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Correu electrònic entrant"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Eliminat el correu electrònic entrant."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Contrasenya antiga incorrecta"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Nom d'usuari o contrasenya incorrectes."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1060,30 +1229,31 @@ msgstr ""
 "correu electrònic registrada."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "L'URL de l'avatar '%s' és invàlid"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Correu electrònic invàlid: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "La pàgina personal '%s' és invàlida"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "L'URL de la llicència '%s' és invàlid"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "El contingut de l'avís és invàlid"
 
@@ -1098,13 +1268,13 @@ msgid "Invalid notice url"
 msgstr "L'URL de l'avís '%s' és invàlid"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "L'URL del perfil '%s' és invàlid."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "L'URL del perfil és invàlid (format incorrecte)"
 
@@ -1122,44 +1292,52 @@ msgstr "Mida invàlida."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nom d'usuari o contrasenya invàlids."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Invitació(ons) enviada(des)"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Invitació(ons) enviada(des) a la següent gent:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Invitar"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Invitar nous usuaris"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 ""
-"Utilitza el software de microblogging [StatusNet](http://status.net), versió %"
-"s, disponible sota la [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+"Utilitza el software de microblogging [StatusNet](http://status.net), versió "
+"%s, disponible sota la [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1170,12 +1348,14 @@ msgstr ""
 "missatgeria instantània o a GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Idioma"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "L'idioma és massa llarg (màx 50 caràcters)."
 
@@ -1184,7 +1364,15 @@ msgstr "L'idioma és massa llarg (màx 50 caràcters)."
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Ubicació"
 
@@ -1193,7 +1381,12 @@ msgstr "Ubicació"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
 
@@ -1202,18 +1395,22 @@ msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Inici de sessió"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Inici de sessió amb un compte [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1224,22 +1421,26 @@ msgstr ""
 "tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova "
 "[OpenID] (%%action.openidlogin%%)."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Sortir"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nom llarg, preferiblement el teu nom \"real\""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Contrasenya oblidada o perduda?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Posar un nou correu electrònic per publicar; cancel·lar l'antic."
 
@@ -1250,16 +1451,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestionar com reps correus de %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Membre des de"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog de %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1272,42 +1475,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "El meu text i els meus fitxers estan disponibles sota "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Nou"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nou correu electrònic per publicar a %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "Nou correu electrònic entrant afegit."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Nou sobrenom"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Nou avís"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
 
@@ -1317,7 +1528,13 @@ msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Sobrenom"
 
@@ -1326,7 +1543,12 @@ msgstr "Sobrenom"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 
@@ -1335,49 +1557,60 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
 "espais."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Sobrenom no permès."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Sobrenom de l'usuari que vols seguir"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Sobrenom o correu electrònic"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "No"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Cap Jabber ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Cap petició d'autorització!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "No s'ha sel·leccionat cap transport."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "No hi ha cap codi entrat"
 
@@ -1389,11 +1622,15 @@ msgstr "Cap codi de confirmació."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Cap contingut!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "No hi ha cap direcció de correu electrònic."
 
@@ -1402,7 +1639,9 @@ msgid "No id."
 msgstr "Cap identificador."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "No hi ha cap direcció de correu electrònic entrant."
 
@@ -1413,6 +1652,7 @@ msgstr "Cap sobrenom retornat pel servidor remot."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Cap sobrenom."
 
@@ -1420,12 +1660,14 @@ msgstr "Cap sobrenom."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Cap confirmació pendent per a cancel·lar."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "No hi ha cap número de telèfon."
 
@@ -1435,7 +1677,8 @@ msgid "No profile URL returned by server."
 msgstr "Cap URL de perfil retornar pel servidor."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Cap adreça de correu electrònic registrada per aquest usuari."
 
@@ -1447,7 +1690,7 @@ msgstr "Cap petició trobada!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Cap resultat"
 
@@ -1458,12 +1701,16 @@ msgstr "Cap mida."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "No s'ha trobat cap estatus amb aquesta ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "No s'ha trobat cap estatus amb la ID trobada."
 
@@ -1473,13 +1720,15 @@ msgid "No such OpenID."
 msgstr "No existeix aquest compte OpenID."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "No existeix aquest document."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No existeix aquest avís."
 
@@ -1517,12 +1766,22 @@ msgstr "No existeix aquesta subscripció"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "No existeix aquest usuari."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "No hi ha cap usuari amb aquesta direcció o usuari."
 
@@ -1536,32 +1795,38 @@ msgid "Not a recovery code."
 msgstr "No és un codi de recuperació."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Usuari no registrat."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Format de data no suportat."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no vàlid"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "OpenID no vàlid."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "No és una direcció de correu electrònic vàlida."
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Adreça de correu electrònic no vàlida."
 
@@ -1569,6 +1834,11 @@ msgstr "Adreça de correu electrònic no vàlida."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
 
@@ -1588,7 +1858,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "URL de perfil no vàlid (cap document YADIS)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "No és una imatge o és un fitxer corrupte."
 
@@ -1599,11 +1870,13 @@ msgstr "No autoritzat."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Resposta inesperada!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "No s'ha trobat"
 
@@ -1619,11 +1892,15 @@ msgstr "No s'ha trobat"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "No connectat."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "No estàs subscrit!"
 
@@ -1640,39 +1917,44 @@ msgid "Notice feed for %s"
 msgstr "Feed d'avisos de %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Avís sense perfil"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Avisos"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Aviso etiquetats amb %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Antiga contrasenya"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "Configuració del compte OpenID"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "Auto-enviament d'OpenID"
 
@@ -1680,29 +1962,34 @@ msgstr "Auto-enviament d'OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "Accés OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "URL OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "Autenticació OpenID cancel·lada."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Autenticació OpenID fallida: %s."
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Error OpenID: %s"
@@ -1718,11 +2005,12 @@ msgid "OpenID settings"
 msgstr "Configuració OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcionalment pots afegir un missatge a la invitació."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Càrrega parcial."
 
@@ -1732,34 +2020,46 @@ msgstr "Càrrega parcial."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Contrasenya"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "La contrasenya i la confirmació no coincideixen."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "La contrasenya ha de tenir 6 o més caràcters."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Recuperació de contrasenya sol·licitada"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Contrasenya guardada."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Les contrasenyes no coincideixen."
 
@@ -1779,14 +2079,17 @@ msgid "People search"
 msgstr "Cerca de gent"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Personal"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Missatge personal"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi"
 
@@ -1801,7 +2104,7 @@ msgstr ""
 "avisos de ningú, clica \"Cancel·lar\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Enviar un avís quan el meu estat Jabber/GTalk canvii."
 
@@ -1810,7 +2113,9 @@ msgstr "Enviar un avís quan el meu estat Jabber/GTalk canvii."
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -1819,42 +2124,52 @@ msgstr "Preferències"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Preferències guardades."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Preferència d'idioma"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Privacitat"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Problema en guardar l'avís."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Perfil"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "URL del perfil"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configuració del perfil"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Perfil desconegut"
 
@@ -1863,17 +2178,19 @@ msgid "Public Stream Feed"
 msgstr "Feed del flux públic"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Línia temporal pública"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publica una MicroID per a la meva direcció de Jabber/GTalk."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publica una MicroID per al meu correu electrònic."
 
@@ -1883,12 +2200,14 @@ msgid "Recent Tags"
 msgstr "Etiquetes recents"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Recuperar"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Recuperar contrasenya"
 
@@ -1901,37 +2220,45 @@ msgstr "Codi de recuperació d'un usuari desconegut."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrar-se"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Registre no permès."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Registre satisfactori"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Rebutjar"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Recorda'm"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Perfil remot sense perfil corresponent"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Subscripció remota"
 
@@ -1945,6 +2272,9 @@ msgstr "Subscripció remota"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1953,7 +2283,7 @@ msgstr "Eliminar"
 msgid "Remove OpenID"
 msgstr "Eliminar OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1962,34 +2292,41 @@ msgstr ""
 "eliminar-lo, afegeix un altre abans."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Respostes"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostes a %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Restablir"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Restablir contrasenya"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "Número de telèfon pels SMS"
 
@@ -1998,17 +2335,18 @@ msgstr "Número de telèfon pels SMS"
 msgid "SMS Settings"
 msgstr "Configuració SMS"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "Confirmació SMS"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Igual a la contrasenya de dalt"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Igual a la contrasenya de dalt. Requerit."
 
@@ -2021,12 +2359,21 @@ msgstr "Igual a la contrasenya de dalt. Requerit."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Guardar"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Cercar"
 
@@ -2036,7 +2383,7 @@ msgid "Search Stream Feed"
 msgstr "Feed del flux de cerca"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2045,7 +2392,7 @@ msgstr ""
 "Troba avisos a %%site.name%% per contingut. Separa els termes de cerca amb "
 "espais; han de ser majors a 3 caràcters."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2055,37 +2402,41 @@ msgstr ""
 "de cerca amb espais; han de ser majors a 3 caràcters."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Selecciona un transport"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Enviar"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr ""
-"Enviar correu electrònic a aquesta direcció per publicar noves "
-"notificacions."
+"Enviar correu electrònic a aquesta direcció per publicar noves notificacions."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 "Envia'm notificacions quan algú nou se'm subscrigui, al meu correu "
 "electrònic."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviar-me avisos per Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2094,17 +2445,20 @@ msgstr ""
 "exorbitant càrrega del meu transport."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Envia'm respostes a través de Jabber/GTalk de la gent a la que no estic "
 "subscrita."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Configuració"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Configuració guardada."
 
@@ -2124,27 +2478,32 @@ msgid "Something weird happened."
 msgstr "Alguna cosa estranya ha passat."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Perdó, no hi ha un correu electrònic entrant permès."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Perdó, aquest no és el teu correu electrònic entrant permès."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Font"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Estadístiques"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "No s'ha trobat l'OpenID emmagatzemat."
 
@@ -2152,24 +2511,28 @@ msgstr "No s'ha trobat l'OpenID emmagatzemat."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Subscriure's"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Subscriptors"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Subscripció autoritzada"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Subscripció rebutjada"
 
@@ -2177,28 +2540,35 @@ msgstr "Subscripció rebutjada"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subscripcions"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Error del sistema en pujar el fitxer."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Etiquetes"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Text"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Cerca de text"
 
@@ -2218,6 +2588,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Aquest codi de confirmació no és per a tu!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Aquest correu electrònic pertany a un altre usuari."
 
@@ -2227,63 +2598,73 @@ msgid "That file is too big."
 msgstr "Aquest fitxer és massa gran."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Aquest ja és el teu Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Aquest ja és el teu correu electrònic."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Aquest ja és el teu número de telèfon."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Aquest no és el teu Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Aquest no és el teu correu electrònic"
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Aquest no és el teu número de telèfon."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Aquest és un número de confirmació incorrecte."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Aquest número de telèfon pertany a un altre usuari."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Massa llarg. La longitud màxima és de 140 caràcters."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Massa llarg. La longitud màxima és de 255 caràcters."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'adreça \"%s\" ha estat confirmada per al teu compte."
@@ -2292,11 +2673,14 @@ msgstr "L'adreça \"%s\" ha estat confirmada per al teu compte."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "L'adreça ha estat eliminada."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2306,7 +2690,8 @@ msgstr ""
 "Llegeix de nou les instruccions per a saber com autoritzar la subscripció. "
 "El teu identificador de subscripció és:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2316,34 +2701,39 @@ msgstr ""
 "de nou les instruccions per a saber com rebutjar la subscripció completament."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Aquestes són les persones que escolten els avisos de %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Aquestes són les persones que escolten els teus avisos."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Aquestes són les persones que %s escolta."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Aquestes són les persones que escoltes."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Aquestes persona ja són usuaris i tu estàs subscrit automàticament a ells:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Aquest codi de confirmació és massa vell. Si us plau comença de nou."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2352,7 +2742,7 @@ msgstr ""
 "botó d'enviament per a anar al teu proveïdor d'OpenID."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2367,6 +2757,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Aquest mètode requereix POST o DELETE."
 
@@ -2375,25 +2768,37 @@ msgstr "Aquest mètode requereix POST o DELETE."
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Aquest mètode requereix POST."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Franja horària"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Franja horària no seleccionada."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2406,18 +2811,21 @@ msgstr ""
 "perfil a sota."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Dos ids d'usuari o screen_names has de ser substituïts."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL del teu web, blog o perfil en un altre lloc"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL del teu perfil en un altre servei de microblogging compatible"
 
@@ -2429,15 +2837,22 @@ msgstr "URL del teu perfil en un altre servei de microblogging compatible"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Restabliment de contrasenya inesperat."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Acció desconeguda"
 
@@ -2468,38 +2883,47 @@ msgstr "Cancel·lar subscripció"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Versió OMB no suportada"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Format d'imatge no suportat."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Actualitzacions per SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Actualitzacions per Missatgeria Instantània"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualitzacions de %1$s i amics a %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualitzacions de %1$s a %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Pujar"
 
@@ -2520,6 +2944,7 @@ msgid "Upload a new profile image"
 msgstr "Carregar una nova imatge per al perfil"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -2527,7 +2952,9 @@ msgstr ""
 "utilitzin aquest servei."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes"
@@ -2552,11 +2979,16 @@ msgstr "L'usuari que vols seguir no existeix."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "L'usuari no té perfil."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Sobrenom de l'usuari"
 
@@ -2565,29 +2997,33 @@ msgid "User not found."
 msgstr "No s'ha trobat l'usuari."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "Quina franja horària seria normal ser?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipus d'imatge incorrecte per a '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Mida d'imatge incorrecta per a '%s'"
@@ -2595,7 +3031,9 @@ msgstr "Mida d'imatge incorrecta per a '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Sí"
 
@@ -2618,11 +3056,12 @@ msgid "You are already logged in!"
 msgstr "Ja t'has connectat!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Ja estàs subscrit a aquests usuaris:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "No ets amic dels usuaris que has especificat."
 
@@ -2639,16 +3078,17 @@ msgstr "Pots crear un nou compte i començar a enviar avisos."
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
-"Pots rebre missatges SMS a través del teu coreu electrònic des de "
-"%%site.name%%."
+"Pots rebre missatges SMS a través del teu coreu electrònic des de %%site.name"
+"%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "Pots eliminar un OpenID del teu compte clicant el botó \"Eliminar\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2657,7 +3097,8 @@ msgstr ""
 "Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de Jabber/"
 "GTalk. Configura la teva adreça i opcions a sota."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2668,21 +3109,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Pots utilitzar la subscripció local!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "No ens vas enviar aquest perfil"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2704,11 +3147,13 @@ msgstr ""
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "No pots eliminar l'estatus d'un altre usuari."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
@@ -2716,6 +3161,7 @@ msgstr ""
 "%s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2723,22 +3169,23 @@ msgstr ""
 "Seràs avisat quan les teves invitacions siguin acceptades i els teus "
 "convidats es registrin al lloc. Gràcies per fer créixer la comunitat."
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "T'has identificat. Escriu una nova contrasenya a continuació."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "El teu URL OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "El teu nom d'usuari en aquest servidor, o la teva adreça de correu "
 "electrònic registrada."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2747,47 +3194,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) et permet accedir a molts llocs amb un mateix "
 "compte d'usuari. Administra els teus OpenID associats aquí."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "fa pocs segons"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "fa %d dies"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "fa %d hores"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fa %d minuts"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "fa %d mesos"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "fa un dia"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "fa un minut"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "fa un mes"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "fa un any"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "fa una hora"
 
@@ -2809,12 +3266,14 @@ msgid "reply"
 msgstr "resposta"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "repeteix la contrasenya anterior"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "tipus de fitxer no suportat"
 
@@ -2835,6 +3294,26 @@ msgstr "« Posterior"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
@@ -2845,6 +3324,7 @@ msgid "This notice is not a favorite!"
 msgstr "Aquesta notificació no és un favorit!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "No pots eliminar favorits."
 
@@ -2852,23 +3332,29 @@ msgstr "No pots eliminar favorits."
 msgid "Favor"
 msgstr "Favorit"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Envia'm un correu electrònic quan algú afegeixi una nota meva com a favorit."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Aquesta nota ja és favorita."
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "No es pot crear favorit."
 
@@ -2878,11 +3364,13 @@ msgstr "Desfavorit"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s notificacions favorites"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Feed de notes favorites de %s"
@@ -2926,33 +3414,44 @@ msgid "Login with your username and password. "
 msgstr "Entra amb el teu usuari i contrasenya. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "És massa llarg. Màxim del missatge és 140 caràcters."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "No has especificat el destinatari."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "No pots enviar un missatge a aquest usuari."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "Aquest usuari no existeix"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nou missatge"
 
@@ -3008,6 +3507,11 @@ msgstr "Pots actualitzar la informació del teu perfil aquí "
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Usuari sense perfil coincident"
 
@@ -3036,6 +3540,8 @@ msgid "New password successfully saved. "
 msgstr "La nova contrasenya s'ha guardat satisfactòriament. "
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
 
@@ -3059,12 +3565,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "Per subscriure't, pots [accedir] (%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Feed per favorits de %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "No s'ha pogut recuperar els avisos de favorits."
 
@@ -3072,7 +3581,7 @@ msgstr "No s'ha pogut recuperar els avisos de favorits."
 msgid "No such message."
 msgstr "No existeix el missatge."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Només el remitent i el receptor poden llegir aquest missatge."
 
@@ -3096,51 +3605,70 @@ msgid "Mobile carrier for your phone. "
 msgstr "Transport per al teu telèfon. "
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Missatges directes a %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Tots els missatges directes enviats a %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Missatges directes que has enviat"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Tots els missatges directes enviats per %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "No hi ha text al missatge!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "No has escrit cap usuari receptor."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "No pots enviar missatges directes a usuaris que no siguin amics teus."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favorits de %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s actualitzacions favorites per %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s ha afegit la teva nota com a favorita"
@@ -3163,14 +3691,17 @@ msgstr ""
 "a Twitter, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Configuració Twitter"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Compte Twitter"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Compte Twitter verificat actualment."
 
@@ -3179,6 +3710,7 @@ msgid "Twitter Username"
 msgstr "Usuari Twitter"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "No espais, si us plaus."
 
@@ -3187,18 +3719,22 @@ msgid "Twitter Password"
 msgstr "Contrasenya Twitter"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Automàticament envia les meves notes a Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Envia respostes locals '@' a Twitter."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Subscriure'm als meus amics de Twitter aquí."
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3207,6 +3743,7 @@ msgstr ""
 "minúscules, i guions baixos (_). 15 caràcters màxim."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "No es poden verificar les teves credencials de Twitter!"
 
@@ -3217,33 +3754,43 @@ msgstr "No es pot recuperar la informació del compte per \"%s\" de Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Configuració de Twitter guardada."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Aquest no és el teu compte de Twitter."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "No es pot eliminar aquest usuari de Twitter."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Compte de Twitter eliminat."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "No es poden guardar les preferències de Twitter."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Preferències de Twitter guardades."
 
@@ -3260,18 +3807,19 @@ msgid "The subscription has been rejected, but no "
 msgstr "La subscripció ha estat rebutjada, però no "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Resultats de les comandes"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Comanda completada"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Comanda fallida"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Perdona, aquesta comanda no està implementada."
 
@@ -3281,89 +3829,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "Subscripcions: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "L'usuari no té última nota"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Nota marcada com a favorita."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nom complet: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Localització: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pàgina web: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Sobre tu: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Missatge directe per a %s enviat"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Error al enviar el missatge directe."
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especifica el nom de l'usuari a que vols subscriure't"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Subscrit a %s"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Has deixat d'estar subscrit a %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Comanda encara no implementada."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Notificacions off."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "No es poden posar en off les notificacions."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Notificacions on."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "No es poden posar en on les notificacions."
 
@@ -3371,11 +3941,11 @@ msgstr "No es poden posar en on les notificacions."
 msgid "Commands:\n"
 msgstr "Comandes:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "No s'ha pogut inserir el missatge."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "No s'ha pogut inserir el missatge amb la nova URI."
 
@@ -3392,7 +3962,7 @@ msgstr ""
 "Tens una nova direcció per publicar a %1$s.\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "Nou missatge privat de %s"
@@ -3406,7 +3976,7 @@ msgstr ""
 "%1$s (%2$s) t'ha enviat un nou missatge privat:\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "Només l'usuari pot llegir les seves safates de correu."
 
@@ -3415,31 +3985,39 @@ msgid "This form should automatically submit itself. "
 msgstr "Aquest formulari s'ha d'enviar automàticament. "
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Favorits"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s's notes favorites"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Usuari"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Safata d'entrada"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Els teus missatges rebuts"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Safata de sortida"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Els teus missatges enviats"
 
@@ -3452,14 +4030,19 @@ msgid "Twitter integration options"
 msgstr "Opcions d'integració amb Twitter"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "A"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "No es pot analitzar el missatge."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s i amics, pàgina %d"
@@ -3469,21 +4052,31 @@ msgid "You can upload your personal avatar."
 msgstr "Pots pujar el teu avatar personal."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Configuració de l'avatar"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Previsualitzar"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Crop"
 
@@ -3500,36 +4093,45 @@ msgid "There was a problem with your session token. "
 msgstr "Ha ocorregut un error amb la teva sessió. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 "Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu "
 "avatar."
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "S'ha perdut el nostre fitxer de dades."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "Hem perdut el nostre arxiu."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "Tipus de fitxer desconegut"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "No s'ha especificat perfil."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "No hi ha cap perfil amb aquesta ID."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Usuari bloquejat."
 
@@ -3537,11 +4139,11 @@ msgstr "Usuari bloquejat."
 msgid "Are you sure you want to block this user? "
 msgstr "N'estàs segur/a que vols bloquejar aquest usuari? "
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Ja havies bloquejat aquest usuari."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "Error al guardar la informació del block."
 
@@ -3558,38 +4160,56 @@ msgstr "Estàs a punt d'eliminar permanentment una notificació. "
 msgid "Add to favorites"
 msgstr "Afegir a favorits"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Editar el grup %s"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr "La safata d'entrada ha d'estar habilitat per als grups de treball"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Has d'haver entrat per crear un grup."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "Cap sobrenom."
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "No existeix tal grup"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Has de ser admin per editar aquest grup"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Utilitza aquest formulari per editar el grup."
 
@@ -3600,14 +4220,15 @@ msgstr ""
 "espais. "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "la descripció és massa llarga (màx. 140 caràcters)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "No s'ha pogut actualitzar el grup."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "Configuració guardada."
 
@@ -3624,7 +4245,8 @@ msgstr "Indicar una nova direcció de correu electrònic per publicar; "
 msgid "Send me email when someone "
 msgstr "Envia'm un correu electrònic quan algú "
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permetre que els amics em reclamin i m'enviïn un correu electrònic."
 
@@ -3638,7 +4260,7 @@ msgstr ""
 "S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània que "
 "has afegit. "
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "Error del servidor - no es pot obtenir l'usuari!"
 
@@ -3652,51 +4274,66 @@ msgstr "Si vols l'aplicació %s per actualitzar automàticament "
 msgid "Allow %s to update my Facebook status"
 msgstr "Permetre %s actualitzar el meu estat a Facebook"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Saltar"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr "Cap contingut!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Paginació"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "Posteriors"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "Anteriors"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Gràcies per convidar els teus amics a utilitzar %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "Les invitacions han estat enviades als següents usuaris:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "Has estat convidat a %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr "Convidar els teus amics a utilitzar %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Amics ja utilitzant %s:"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Enviar invitacions"
@@ -3707,7 +4344,8 @@ msgstr "No s'ha pogut eliminar l'usuari de Facebook."
 
 #: actions/facebooksettings.php:65
 msgid "There was a problem saving your sync preferences!"
-msgstr "Ha ocorregut un problema al guardar les preferències de sincronització!"
+msgstr ""
+"Ha ocorregut un problema al guardar les preferències de sincronització!"
 
 #: actions/facebooksettings.php:67
 msgid "Sync preferences saved."
@@ -3740,12 +4378,14 @@ msgstr "Si vols que %s s'actualitzi automàticament "
 msgid "Sync preferences"
 msgstr "Preferències de sincronització"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Desfavoritar favorit"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Notificacions populars"
 
@@ -3759,7 +4399,8 @@ msgid "The most popular notices on the site right now."
 msgstr "Les notificacions més populars en aquest lloc ara mateix."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Usuaris destacats"
 
@@ -3773,15 +4414,17 @@ msgstr "Usuaris destacats, pàgina %d"
 msgid "A selection of some of the great users on %s"
 msgstr "Una selecció d'alguns dels millors usuaris a %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "No ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Logo del grup"
 
@@ -3789,11 +4432,13 @@ msgstr "Logo del grup"
 msgid "You can upload a logo image for your group."
 msgstr "Pots pujar una imatge de logo per al grup."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Logo actualitzat."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "Error en actualitzar logo."
 
@@ -3812,7 +4457,8 @@ msgid "A list of the users in this group."
 msgstr "La llista dels usuaris d'aquest grup."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grups"
 
@@ -3827,6 +4473,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "%%%%site.name%%%% grups amb qui pots trobar i parlar "
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "Crear nou grup"
 
@@ -3836,7 +4483,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr "Troba grups a %%site.name%% per nom, ubicació o descripció. "
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Cercar grup"
 
@@ -3858,20 +4505,20 @@ msgstr "Enviar-me avisos per Jabber/GTalk."
 msgid "A confirmation code was sent "
 msgstr "Un codi de confirmació ha estat enviat "
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "Has d'haver entrat per participar en un grup."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "Ja ets membre d'aquest grup"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr "No s'ha pogut afegir l'usuari %s al grup %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s s'ha pogut afegir al grup %s"
@@ -3882,15 +4529,18 @@ msgstr ""
 "Les safates d'entrada han d'estar activades per entrar a formar part dels "
 "grups."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Has d'haver entrat per a poder marxar d'un grup."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "No s'ha trobat el grup."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "No ets membre d'aquest grup."
 
@@ -3898,21 +4548,25 @@ msgstr "No ets membre d'aquest grup."
 msgid "You may not leave a group while you are its administrator."
 msgstr "No pots abandonar aquest grup mentre en sigui l'administrador."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr "No s'han trobat registres dels membres."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s ha abandonat el grup %s"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "Accedir al lloc"
 
@@ -3924,15 +4578,17 @@ msgstr "No té cap estatus ara mateix"
 msgid "New group"
 msgstr "Nou grup"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "Utilitza aquest formulari per crear un nou grup."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "No s'ha pogut crear el grup."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr "No s'ha pogut establir la pertinença d'aquest grup."
 
@@ -3944,11 +4600,14 @@ msgstr "Això és massa llarg. "
 msgid "Don't send a message to yourself; "
 msgstr "No t'enviïs missatges a tu mateix; "
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "Notificació publicada"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Ajax Error"
 
@@ -3967,7 +4626,7 @@ msgstr "Reclamació enviada"
 msgid "Nudge sent!"
 msgstr "Reclamació enviada!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr "Accés OpenID"
 
@@ -3991,28 +4650,32 @@ msgstr "Auto-escurçament de la URL"
 msgid "Service"
 msgstr "Servei"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Servei d'auto-escurçament a utilitzar."
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "El servei d'auto-escurçament d'URL és massa llarga (màx. 50 caràcters)."
+msgstr ""
+"El servei d'auto-escurçament d'URL és massa llarga (màx. 50 caràcters)."
 
 #: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Canviar contrasenya"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr "Contrasenya canviada."
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Etiqueta no vàlida per a la gent: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Usuaris que s'han etiquetat %s - pàgina %d"
@@ -4022,11 +4685,12 @@ msgstr "Usuaris que s'han etiquetat %s - pàgina %d"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Aquests són usuaris que s'han etiquetat ells mateixos \"%s\" "
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informació del perfil"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4038,20 +4702,25 @@ msgid "Automatically subscribe to whoever "
 msgstr "Automàticament subscriure's a tothom "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Etiqueta no vàlida: \"%s\""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "No s'han pogut guardar les etiquetes."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Línia temporal pública, pàgina %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "No s'ha pogut recuperar la conversa pública."
 
@@ -4061,8 +4730,8 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"Això és %%site.name%%, un servei de "
-"[microblogging](http://ca.wikipedia.org/wiki/Microblogging) "
+"Això és %%site.name%%, un servei de [microblogging](http://ca.wikipedia.org/"
+"wiki/Microblogging) "
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4073,11 +4742,13 @@ msgstr "Núvol públic d'etiquetes"
 msgid "These are most popular recent tags on %s "
 msgstr "Aquestes són les etiquetes recents més populars a %s "
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "Núvol d'etiquetes"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Ho senti, però només la gent convidada pot registrar-se."
 
@@ -4127,7 +4798,8 @@ msgstr "(Hauries de rebre un missatge per correu electrònic "
 msgid "That's a local profile! Login to subscribe."
 msgstr "Aquest és un perfil local! Entra per subscriure-t'hi."
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Respostes a %s, pàgina %d"
@@ -4137,50 +4809,71 @@ msgstr "Respostes a %s, pàgina %d"
 msgid "%s favorite notices, page %d"
 msgstr "%s notificacions favorites, pàgina %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s grup"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s grup, pàgina %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Perfil del grup"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr "Avisos"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Accions del grup"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr "Feed d'avisos del grup %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Membres"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(Cap)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "Tots els membres"
 
@@ -4190,14 +4883,14 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de "
-"[microblogging](http://ca.wikipedia.org/wiki/Microblogging)"
+"**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]"
+"(http://ca.wikipedia.org/wiki/Microblogging)"
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
 msgstr "Només el remitent i el destinatari "
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, pàgina %d"
@@ -4207,30 +4900,37 @@ msgid "'s profile"
 msgstr "perfil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "Perfil de l'usuari"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Foto"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "Accions de l'usuari"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "Enviar un missatge directe a aquest usuari"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Missatge"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "Tots els subscriptors"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "Tots els grups"
 
@@ -4240,8 +4940,8 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** té un compte a %%%%site.name%%%%, un servei de "
-"[microblogging](http://ca.wikipedia.org/wiki/Microblogging) "
+"**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://"
+"ca.wikipedia.org/wiki/Microblogging) "
 
 #: actions/smssettings.php:128
 msgid "Phone number, no punctuation or spaces, "
@@ -4256,7 +4956,7 @@ msgid "A confirmation code was sent to the phone number you added. "
 msgstr ""
 "El codi de confirmació s'ha enviat al número de telèfon que tens afegit. "
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Transport mòbil"
 
@@ -4314,16 +5014,17 @@ msgstr "Aquestes són les persones les notícies dels quals "
 msgid "These are the people whose "
 msgstr "Aquestes són les persones les quals"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Notificació etiquetada amb %s, pàgina %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "Missatges etiquetats \"%s\", més recents primer"
@@ -4345,7 +5046,7 @@ msgstr "Etiqueta %s"
 msgid "Tag user"
 msgstr "Etiqueta usuari"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4357,18 +5058,18 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "Ha ocorregut algun problema amb la teva sessió."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Només pots etiquetar gent a la que estiguis subscrit o que s'hagin subscrit "
 "a tu."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "No s'han pogut guardar les etiquetes."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Utilitza aquest formulari per afegir etiquetes als teus subscriptors i "
@@ -4378,20 +5079,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "No existeix aquesta etiqueta."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "Microblog etiquetat com %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Ha fallat el bloqueig d'usuari."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "Ha fallat el desbloqueig d'usuari."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "No s'ha trobat."
 
@@ -4399,15 +5103,16 @@ msgstr "No s'ha trobat."
 msgid "Add your Twitter account to automatically send "
 msgstr "Afegeix el teu compte Twitter per automàticament enviar "
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Usuari Twitter"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Contrasenya Twitter"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Amics Twitter"
 
@@ -4420,145 +5125,154 @@ msgstr "Nom d'usuari sols pot contenir números, "
 msgid "Unable to retrieve account information "
 msgstr "No s'ha pogut obtenir informació del compte "
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "Error al moure el block."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "No id en el perfil sol·licitat."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "No hi ha cap perfil amb aquesta id."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "No subscrit"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "%s grups"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s grups, pàgina %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema al guardar la notificació. Usuari desconegut."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
 "minuts."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Pujar un avatar"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Altres"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Altres opcions"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Pàgina sense titol"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Navegació primària del lloc"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Perfil personal i línia temporal dels amics"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Cercar gent o text"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Compte"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Canviar correu electrònic, avatar, contrasenya, perfil"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Connectar a missatgeria instantània, SMS, Twitter"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Sortir d'aquest lloc"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Accedir a aquest lloc"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Crear nou compte"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "Accedir amb OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "Ajuda'm"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr "Avís del lloc"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "Vistes locals"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr "Notificació pàgina"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Navegació del lloc secundària"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Llicència del programari StatusNet"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "Tot "
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "llicència."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "Bloquejar aquest usuari"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Bloquejar"
 
@@ -4571,11 +5285,14 @@ msgstr "Deixar de tenir favorita aquesta notificació"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "Per utilitzar la Aplicació de Facebook %s necessites haver accedit "
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr " un nou compte."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "Publicat"
 
@@ -4595,53 +5312,59 @@ msgstr "Filtre d'etiquetes"
 msgid "All"
 msgstr "Tot"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Elegeix una etiqueta para reduir la llista"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Anar"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL del teu web, blog del grup u tema"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Descripció"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Descriu el grup amb 140 caràcters"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Localització del grup, si n'hi ha, com \"Ciutat, Estat (o Regió), País\""
+msgstr ""
+"Localització del grup, si n'hi ha, com \"Ciutat, Estat (o Regió), País\""
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Grup"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "Admin"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Editar propietats del grup %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Afegir o editar logo %s"
@@ -4671,11 +5394,11 @@ msgstr "Inici de sessió"
 msgid "Leave"
 msgstr "Abandonar"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Accedir amb el nom d'usuari i contrasenya"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Crear nou compte"
 
@@ -4697,17 +5420,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s ara està escoltant "
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Ubicació: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Pàgina personal: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4716,7 +5439,7 @@ msgstr ""
 "Biografia: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Has estat reclamat per %s"
@@ -4731,39 +5454,47 @@ msgstr "%1$s (%2$s) vol saber què estàs fent "
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s ha afegit la teva notificació des de %2$s."
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "Des de"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar notificació directa"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "Enviar notificació"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Caràcters disponibles"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "en resposta a"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "respondre a aquesta nota"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Respondre"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Eliminar aquesta nota"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -4784,27 +5515,29 @@ msgstr "Enviar una reclamació a aquest usuari"
 msgid "Tags in %s's notices"
 msgstr "Etiquetes en les notificacions de %s's"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(cap)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Públic"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grups d'usuaris"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etiquetes recents"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Destacat"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
@@ -4820,31 +5553,33 @@ msgstr "Trobar un grup en aquest lloc"
 msgid "Untitled section"
 msgstr "Secció sense títol"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Persones %s subscrites a"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Persones subscrites a %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s grups són membres de"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convidar amics i companys perquè participin a %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Un usuari t'ha bloquejat."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Subscriure's a aquest usuari"
 
@@ -4857,10 +5592,11 @@ msgid "Top posters"
 msgstr "Que més publiquen"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Desbloquejar aquest usuari"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Desbloquejar"
 
@@ -4868,23 +5604,2066 @@ msgstr "Desbloquejar"
 msgid "Unsubscribe from this user"
 msgstr "Deixar d'estar subscrit des d'aquest usuari"
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed per a amics de %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed per a amics de %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed per a amics de %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Crear nou compte"
+msgid "You and friends"
+msgstr "%s i amics"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "No s'ha pogut confirmar el correu electrònic."
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Pots pujar el teu avatar personal."
 
-#~ msgid "Email address"
-#~ msgstr "Adreça de correu electrònic"
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar actualitzat."
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Error en inserir avís"
+#: actions/block.php:129 actions/block.php:136
+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 ""
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "Si has oblidat o has perdut la teva contrasenya, pots rebre una de nova a "
-#~ "l'adreça de correu electrònic que vas utilitzar per a registrar el teu "
-#~ "compte."
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Estàs a punt d'eliminar permanentment una notificació.  Una vegada ho facis, "
+"no ho podràs desfer."
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
+"us plau."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Pots pujar una imatge de logo per al grup."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+"Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu "
+"avatar."
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Microblog de %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els termes "
+"de cerca amb espais; han de ser majors a 3 caràcters."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Error al enviar el missatge directe."
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Cerca \"%s\" al flux"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i "
+"contrasenya abans de canviar la teva configuració."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Feed del flux públic"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Feed del flux públic"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Feed del flux públic"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"excepte les següents dades privades: contrasenya, adreça de correu "
+"electrònic, adreça de missatgeria instantània, número de telèfon."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Crear"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Perfil del grup"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "perfil"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Safata de sortida per %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Configuració del perfil"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"S'ha enviat un codi de confirmació al número de telèfon has afegit. Revisa "
+"la teva safata d'entrada (i la carpeta de spam!) per veure aquest codi i les "
+"instruccions per utilitzar-lo."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Aquest usuari no existeix"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Afegit el teu compte Twitter per tal d'enviar automàticament les teves notes "
+"a Twitter, "
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "No es pot recuperar la informació del compte per \"%s\" de Twitter."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"Si us plau, revisa aquestes dades per a estar segur que desitges "
+"subscriure't als avisos d'aquest usuari. Si no has demanat subscriure't als "
+"avisos de ningú, clica \"Cancel·lar\"."
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Cercar gent o text"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
+"minuts."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Connectar a missatgeria instantània, SMS, Twitter"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Reclamar"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "Per utilitzar la Aplicació de Facebook %s necessites haver accedit "
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s ara està escoltant els teus avisos a %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Atentament,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Cercar"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "No existeix aquest document."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "La llista dels usuaris d'aquest grup."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "La llista dels usuaris d'aquest grup."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Perfil de l'usuari"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s i amics, pàgina %d"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "La llista dels usuaris d'aquest grup."
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Ha fallat el desbloqueig d'usuari."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Codi de confirmació"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "No es pot esborrar la notificació."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Etiqueta no vàlida: \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Aquest sobrenom ja existeix. Prova un altre. "
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "No es pot crear favorit."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nou avís"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nou avís"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Sobrenom no vàlid."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "No s'ha especificat perfil."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Un usuari t'ha bloquejat."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "No ets membre d'aquest grup."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Usuari bloquejat."
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Has d'haver entrat per crear un grup."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Grups"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "No s'ha pogut actualitzar l'usuari."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Preferències de sincronització guardades."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Has de ser admin per editar aquest grup"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Admin"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Cap resultat"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Un usuari t'ha bloquejat."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Missatge"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "No s'ha pogut guardar el perfil."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) et permet accedir a molts llocs amb un mateix "
+"compte d'usuari. Administra els teus OpenID associats aquí."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Configuració del perfil"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"Això és %%site.name%%, un servei de [microblogging](http://ca.wikipedia.org/"
+"wiki/Microblogging) "
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Si has oblidat o has perdut la teva contrasenya, pots obtenir-ne una de nova "
+"que t'enviarem al correu electrònic que tinguis posat  al teu compte."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "T'has identificat. Escriu una nova contrasenya a continuació."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Recuperació de contrasenya sol·licitada"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Error amb el codi de confirmació."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Subscriure's a aquest usuari"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s notificacions favorites, pàgina %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Feed d'avisos del grup %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Feed d'avisos del grup %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Feed d'avisos del grup %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]"
+"(http://ca.wikipedia.org/wiki/Microblogging)"
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Admin"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "No existeix aquest usuari."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Aviso etiquetats amb %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Feed d'avisos del grup %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://"
+"ca.wikipedia.org/wiki/Microblogging) "
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s ara està escoltant "
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Aquesta nota ja és favorita."
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Aquesta notificació no és un favorit!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "No s'ha pogut recuperar la conversa pública."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "No has especificat el destinatari."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "No es pot trobar cap estatus."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Notificacions contestant a %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Actualitzacions de %1$s a %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "llicència."
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s subscripcions"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Configuració del perfil"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "No ets membre d'aquest grup."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problema en guardar l'avís."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Missatge per a %1$s a %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Perfil de l'usuari"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Perfil"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Pujar"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Canviar la teva contrasenya"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Connectar-se"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Cercar"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Inici de sessió"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Bloquejar"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Usuari bloquejat."
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Afegir o editar logo %s"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Cap contingut!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Usuari"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Cercar"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "La pàgina personal no és un URL vàlid."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "No existeix aquesta etiqueta."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Missatges directes a %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "És massa llarg. Màxim del missatge és 140 caràcters."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "No pots subscriure't a aquest usuari: L'usuari no existeix."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "la descripció és massa llarga (màx. 140 caràcters)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Ja ets membre d'aquest grup"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "No s'ha pogut afegir l'usuari %s al grup %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "No ets membre d'aquest grup."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s grups"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s grups són membres de"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Accions del grup"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar actualitzat."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Massa llarg. La longitud màxima és de 140 caràcters."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Format d'imatge no suportat."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Foto"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "la descripció és massa llarga (màx. 140 caràcters)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Actualitzacions de %1$s a %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "L'usuari que vols seguir no existeix."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "No autoritzat."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Versió desconeguda del protocol OMB."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "No existeix aquest avís."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Hem perdut el nostre arxiu."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Actualitzacions de %1$s a %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Aquesta pàgina no està disponible en "
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Inicia una sessió amb el teu nom d'usuari i la teva contrasenya. Encara no "
+"tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova "
+"[OpenID] (%%action.openidlogin%%)."
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Actualitzacions de %1$s a %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Totes les actualitzacions que corresponen a la frase a cercar \"%s\" "
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Connectar-se"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Explica'ns alguna cosa sobre tu "
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "La biografia és massa llarga (màx. 140 caràcters)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "URL de perfil no vàlid (cap document YADIS)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Aquest és un perfil local! Entra per subscriure-t'hi."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "No s'ha pogut obtenir un senyal de petició."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Missatge per a %1$s a %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed per a amics de %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed per a amics de %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed per a amics de %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Safata de sortida per %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Notificació publicada"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Aquesta pàgina no està disponible en "
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Si us plau, revisa aquestes dades per a estar segur que desitges "
+"subscriure't als avisos d'aquest usuari. Si no has demanat subscriure't als "
+"avisos de ningú, clica \"Cancel·lar\"."
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"S'ha autoritzat la subscripció, però no s'ha enviat un URL de retorn. "
+"Llegeix de nou les instruccions per a saber com autoritzar la subscripció. "
+"El teu identificador de subscripció és:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"S'ha rebutjat la subscripció, però no s'ha enviat un URL de retorn. Llegeix "
+"de nou les instruccions per a saber com rebutjar la subscripció completament."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "No es pot llegir l'URL de l'avatar '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Tipus d'imatge incorrecte per a '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "No s'ha pogut redirigir al servidor: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Llicència del programari StatusNet"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Reclamació enviada"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "respondre a aquesta nota"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problema en guardar l'avís."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Cap codi de confirmació."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Accedir a aquest lloc"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Selecciona un transport"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Descriu el grup amb 140 caràcters"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Descriu el grup amb 140 caràcters"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Nou avís"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s ha afegit la teva nota com a favorita"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " de "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "No s'ha pogut recuperar la conversa pública."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Eliminar nota."
diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo
index 4618fd73d..69d67bfa2 100644
--- a/locale/cs/LC_MESSAGES/statusnet.mo
+++ b/locale/cs/LC_MESSAGES/statusnet.mo
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index aee74f1af..ddb48f050 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -1,31 +1,29 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Czech
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-07-07 22:07+0000\n"
-"Last-Translator: Tomas Kral <tomas.kral@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:04+0000\n"
+"Language-Team: Czech\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: cs\n"
+"X-Message-Group: out-statusnet\n"
 
-# jak přeložit stream?
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, fuzzy, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Hledej \"%s\" ve Streamu"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -38,17 +36,19 @@ msgid " from "
 msgstr " od "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -80,6 +80,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1 od te� naslouchá tvým sdělením v %2"
@@ -102,25 +103,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1 statusů na %2"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "Veřejný \"Stream\""
@@ -130,40 +134,55 @@ msgstr "Veřejný \"Stream\""
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přátelé"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -172,7 +191,8 @@ msgstr ""
 "**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** je služba mikroblogů."
@@ -184,30 +204,34 @@ msgstr "Přispěvatelá by měly být zmíněny přezdívkou nebo celým jménem
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 znaků nebo �ísel, bez te�ek, �árek a mezer"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 a více znaků"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 a více znaků, a nezapomeňte"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr ""
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -217,6 +241,7 @@ msgstr ""
 "posílání zpráv."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -246,7 +271,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
@@ -269,16 +321,23 @@ msgstr ""
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "O nás"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Přijmout"
 
@@ -289,6 +348,9 @@ msgstr "Přijmout"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Přidat"
 
@@ -306,27 +368,29 @@ msgstr ""
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Adresa"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Všechny odběry"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "VÅ¡echny aktualizace pro %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Všechny položky obsahující \"%s\""
@@ -336,30 +400,37 @@ msgstr "Všechny položky obsahující \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Již přihlášen"
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Již přihlášeno"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorizovaný odběr"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Příště automaticky přihlásit; ne pro po�íta�e, které používá "
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -367,15 +438,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Obrázek"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Obrázek nahrán"
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -385,13 +460,14 @@ msgstr ""
 "ú�tu. (Přidal jste si %s do vašich kontaktů?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
@@ -403,6 +479,8 @@ msgstr "Starší »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "O mÄ›"
 
@@ -410,16 +488,18 @@ msgstr "O mÄ›"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr ""
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Nelze pře�íst adresu obrázku '%s'"
@@ -427,6 +507,8 @@ msgstr "Nelze pře�íst adresu obrázku '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Nelze uložit nové heslo"
 
@@ -434,31 +516,34 @@ msgstr "Nelze uložit nové heslo"
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Zrušit"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Nelze dolozit zákaznický objekt OpenID"
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nelze normalizovat JabberID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Změnit"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr ""
 
@@ -468,11 +553,12 @@ msgid "Change password"
 msgstr "Změnit heslo"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr ""
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr ""
 
@@ -482,6 +568,9 @@ msgstr ""
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Heslo znovu"
 
@@ -494,12 +583,14 @@ msgstr "Potvr� adresu"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Potvr� zrušení"
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr ""
 
@@ -508,7 +599,8 @@ msgstr ""
 msgid "Confirmation code not found."
 msgstr "Potvrzující kód nebyl nalezen"
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -528,20 +620,24 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Připojit"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Zruš existující ú�et"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Nelze vytvořit OpenID z: %s"
@@ -549,35 +645,39 @@ msgstr "Nelze vytvořit OpenID z: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr ""
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Nelze přesměrovat na server: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Nelze uložin informace o obrázku"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Nelze uložit nové informace do profilu"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr ""
 
@@ -597,15 +697,17 @@ msgstr "Nelze konvertovat řetězec požadavku na přístupový řetězec."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Nelze smazat potvrzení emailu"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Nelze smazat odebírání"
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr ""
 
@@ -618,29 +720,38 @@ msgstr "Nelze získat řetězec požadavku."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Nelze vložit potvrzující kód"
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Nelze vložit odebírání"
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Nelze uložit profil"
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -656,42 +767,48 @@ msgstr ""
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Nelze aktualizovat uživatele"
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Vytvořit"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Vytvořit nového uživatele s touto přezdívkou"
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Vytvořit nový ú�et"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Pro toto OpenID již uživatel existuje"
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Potvrzené Jabber/GTalk adresy"
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -700,23 +817,27 @@ msgid "Currently"
 msgstr "Nyní"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Chyba v DB při vkládání odpovědi: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr ""
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Popiš sebe a své zájmy ve 140 znacích"
 
@@ -724,11 +845,13 @@ msgstr "Popiš sebe a své zájmy ve 140 znacích"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Email"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr ""
 
@@ -738,39 +861,43 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Emailová adresa již existuje"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Potvrzení emailové adresy"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr ""
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Zadej přezdívku nebo emailovou adresu"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Chyba potvrujícího řetězce"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Chyba při propojení uživatele na OpenID"
 
@@ -781,39 +908,46 @@ msgstr "Chyba přihlašování uživatele"
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Chyba při kládání obrázku"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Chyba při vkládání nového profilu"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Chyba při vkládaní vzdáleného profilu"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Chyba při ukládání potvrzení adresy"
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Chyba při ukládnání vzdáleného profilu"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Chyba při ukládaní profilu"
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Chyba při ukládaní uživatele"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Chyba při ukládaní uživatele; neplatný"
 
@@ -822,6 +956,9 @@ msgstr "Chyba při ukládaní uživatele; neplatný"
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Chyba nastavení uživatele"
 
@@ -832,6 +969,7 @@ msgstr "Chyba při aktualizaci profilu"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Chyba při aktualizaci vzdáleného profilu"
 
@@ -841,33 +979,36 @@ msgid "Error with confirmation code."
 msgstr "Chyba v ověřovacím kódu"
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Existující jméno"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Nahrávání obrázku selhalo."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, fuzzy, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed přítel uživatele: %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, fuzzy, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed odpovědí na %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
@@ -882,7 +1023,7 @@ msgstr ""
 msgid "Find people on this site"
 msgstr ""
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -893,6 +1034,11 @@ msgstr "Z bezpe�nostních důvodů, prosím zadejte znovu své jméno a heslo."
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Celé jméno"
 
@@ -901,23 +1047,33 @@ msgstr "Celé jméno"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Nápověda"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Domů"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Moje stránky"
 
@@ -925,21 +1081,27 @@ msgstr "Moje stránky"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Stránka není platnou URL."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr ""
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr ""
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM adresa"
 
@@ -949,7 +1111,7 @@ msgid "IM Settings"
 msgstr "IM nastavení"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -957,7 +1119,7 @@ msgstr ""
 "Pokud již máte ú�et, přihlašte se pomocí přezdívky a hesla. A poté propojte "
 "ú�et s OpenID."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -965,7 +1127,7 @@ msgstr ""
 "Pokud chcete přidat OpenID k vašemu ú�tu, zadejte OpenID do pole níže a "
 "klikněte na \"Přidat\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -974,25 +1136,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Neplatné heslo"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1001,30 +1169,31 @@ msgstr ""
 "u vašeho ú�tu."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Neplatná adresa obrázku '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Neplatná adresa '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Neplatná adresa licence '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Neplatný obsah sdělení"
 
@@ -1039,13 +1208,13 @@ msgid "Invalid notice url"
 msgstr "Neplatná url sdělení"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Neplatná adresa profilu '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "Neplatná adresa profilu (špatný formát)"
 
@@ -1063,28 +1232,35 @@ msgstr "Neplatná velikost"
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Neplatné jméno nebo heslo"
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr ""
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1096,11 +1272,12 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID již patří jinému uživateli"
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1110,12 +1287,14 @@ msgstr ""
 "jste přidal %s do vašeho seznamu kontaktů."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr ""
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
@@ -1124,7 +1303,15 @@ msgstr ""
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Umístění"
 
@@ -1133,7 +1320,12 @@ msgstr "Umístění"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
 
@@ -1142,18 +1334,22 @@ msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Přihlásit"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Přihlaste se pomocí [OpenID](%%doc.openid%%) ú�tu."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1164,22 +1360,26 @@ msgstr ""
 "[Registrovat](%%action.register%%) nový ú�et, nebo vyzkoušejte [OpenID](%%"
 "action.openidlogin%%)."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Odhlásit"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Ztracené nebo zapomenuté heslo?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -1190,16 +1390,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "ÄŒlenem od"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Mikroblog od %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1209,42 +1411,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Mé texty a soubory jsou k dispozici pod"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Nová přezdívka"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Nové sdělení"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nové heslo"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
 
@@ -1254,7 +1464,13 @@ msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Přezdívka"
 
@@ -1263,7 +1479,12 @@ msgstr "Přezdívka"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou"
 
@@ -1272,47 +1493,58 @@ msgstr "Přezdívku již někdo používá. Zkuste jinou"
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Přezdívka může obsahovat pouze malá písmena a �ísla bez mezer"
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Přezdívka není povolena"
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Přezdívka uživatele, kterého chcete sledovat"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Přezdívka nebo email"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr ""
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Žádné Jabber ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Žádné potvrení!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr ""
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr ""
 
@@ -1324,11 +1556,15 @@ msgstr "Žádný potvrzující kód."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Žádný obsah!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr ""
 
@@ -1337,7 +1573,9 @@ msgid "No id."
 msgstr "Žádné id"
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr ""
 
@@ -1348,6 +1586,7 @@ msgstr "Nebyla poskytnuta žádná přezdívka od servru."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Žádná přezdívka."
 
@@ -1355,12 +1594,14 @@ msgstr "Žádná přezdívka."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Ne�eká žádné potvrzení na zrušení."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr ""
 
@@ -1370,7 +1611,8 @@ msgid "No profile URL returned by server."
 msgstr "Nebylo vráceno žádné URL profilu od servu."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Žádný registrovaný email pro tohoto uživatele."
 
@@ -1382,7 +1624,7 @@ msgstr "Žádný požadavek nebyl nalezen!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Žádné výsledky."
 
@@ -1393,12 +1635,16 @@ msgstr "Žádná velikost"
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1408,13 +1654,15 @@ msgid "No such OpenID."
 msgstr "Žádné takové OpenID"
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Žádný takový dokument."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Žádné takové oznámení."
 
@@ -1452,12 +1700,22 @@ msgstr "Žádné takové odebírání"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Žádný takový uživatel."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr ""
 
@@ -1471,32 +1729,38 @@ msgid "Not a recovery code."
 msgstr "Není obnovujícím kódem"
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr ""
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Není platným Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Není platným OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Není platnou mailovou adresou."
 
@@ -1504,6 +1768,11 @@ msgstr "Není platnou mailovou adresou."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
 
@@ -1523,7 +1792,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Není platnou adresou profilu (není YADIS dokumentem)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Není obrázkem, nebo jde o poškozený soubor."
 
@@ -1534,11 +1804,13 @@ msgstr "Neautorizován."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Ne�ekaná odpově�."
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr ""
 
@@ -1554,11 +1826,15 @@ msgstr ""
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Nepřihlášen"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Nepřihlášen!"
 
@@ -1575,39 +1851,44 @@ msgid "Notice feed for %s"
 msgstr "Feed sdělení pro %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Sdělení nemá profil"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Sdělení"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Staré heslo"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "Nastavení OpenID ú�tu"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "Přihlásit automaticky pomocí OpenID"
 
@@ -1615,29 +1896,34 @@ msgstr "Přihlásit automaticky pomocí OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "OpenID přihlášení"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID adresa"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "Přihlašovaní pomocí OpenID zrušeno"
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Přihlašovaní pomocí OpenID selhalo: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID selhalo: %s"
@@ -1653,11 +1939,12 @@ msgid "OpenID settings"
 msgstr "Nastavení OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Částe�né náhrání."
 
@@ -1667,34 +1954,46 @@ msgstr "Částe�né náhrání."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Heslo"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Heslo a potvrzení nesouhlasí"
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Žádost o obnovu hesla"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Heslo uloženo"
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Hesla nesouhlasí"
 
@@ -1714,14 +2013,17 @@ msgid "People search"
 msgstr "Hledání lidí"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Osobní"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr ""
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
@@ -1736,7 +2038,7 @@ msgstr ""
 "klikněte na \"Zrušit\""
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Poslat oznámení, když se změní můj Jabber/Gtalk status."
 
@@ -1745,7 +2047,9 @@ msgstr "Poslat oznámení, když se změní můj Jabber/Gtalk status."
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Nastavení"
 
@@ -1754,42 +2058,52 @@ msgstr "Nastavení"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Soukromí"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Problém při ukládání sdělení"
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profil"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "Adresa Profilu"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Nastavené Profilu"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Neznámý profil"
 
@@ -1799,17 +2113,19 @@ msgid "Public Stream Feed"
 msgstr "Veřejný Stream Feed"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Veřejné zprávy"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1819,12 +2135,14 @@ msgid "Recent Tags"
 msgstr ""
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Obnovit"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Obnovit"
 
@@ -1837,37 +2155,45 @@ msgstr "Obnovyt kód pro neznámého uživatele"
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrovat"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr ""
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Odmítnout"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Zapamatuj si mÄ›"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Vzdálený profil s nesouhlasícím profilem"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Vzdálený odběr"
 
@@ -1881,6 +2207,9 @@ msgstr "Vzdálený odběr"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Odstranit"
 
@@ -1889,7 +2218,7 @@ msgstr "Odstranit"
 msgid "Remove OpenID"
 msgstr "Odstranit OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1898,34 +2227,41 @@ msgstr ""
 "přihlášení, nejprve přidejte jiné OpenID"
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Odpovědi"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpovědi na %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Reset"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Resetovat heslo"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr ""
 
@@ -1934,17 +2270,18 @@ msgstr ""
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Stejné jako heslo výše"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -1957,12 +2294,21 @@ msgstr ""
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Uložit"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Hledat"
 
@@ -1973,7 +2319,7 @@ msgid "Search Stream Feed"
 msgstr "Hledat ve Stream Feed"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1982,7 +2328,7 @@ msgstr ""
 "Hledej sdělení na %%site.name%% podle obsahu. Minimální délka musí být "
 "alespoň 3 znaky"
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -1992,48 +2338,56 @@ msgstr ""
 "Minimální délka musí být alespoň 3 znaky"
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Odeslat"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Zasílat oznámení pomocí Jabber/GTalk"
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Nastavení"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Nastavení uloženo"
 
@@ -2053,27 +2407,32 @@ msgid "Something weird happened."
 msgstr "Něco zvláštního se stalo"
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Zdroj"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Statistiky"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Uložené OpenID nebylo nalezeno."
 
@@ -2081,24 +2440,28 @@ msgstr "Uložené OpenID nebylo nalezeno."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Odebírat"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Odběratelé"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Odběr autorizován"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Odběr odmítnut"
 
@@ -2106,28 +2469,35 @@ msgstr "Odběr odmítnut"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Odběry"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Chyba systému při nahrávání souboru"
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr ""
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr ""
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Vyhledávání textu"
 
@@ -2147,6 +2517,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Tento potvrzující kód vám nepatří!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr ""
 
@@ -2156,63 +2527,73 @@ msgid "That file is too big."
 msgstr "Soubor je příliš velký"
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Toto je již vaše Jabber"
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Toto není váš Jabber"
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Toto je špatná IM adresa"
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adresa \"%s\" byla potvrzena pro váš ú�et"
@@ -2221,11 +2602,14 @@ msgstr "Adresa \"%s\" byla potvrzena pro váš ú�et"
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "Adresa byla odstraněna"
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2235,7 +2619,8 @@ msgstr ""
 "nápovědě jak správně postupovat při potvrzování odběru. Váš řetězec odběru "
 "je:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2245,33 +2630,38 @@ msgstr ""
 "nápovědě jak správně postupovat při zamítání odběru"
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Toto jsou lidé, kteří naslouchají %s sdělením"
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Toto jsou lidé, kteří naslouchají vašim sdělením "
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Toto jsou lidé, jejiž sdělením %s naslouchá"
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Toto jsou lidé, jejiž sdělením nasloucháte"
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Tento potvrzující kód je příliš starý Prosím zkuste znovu"
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2280,7 +2670,7 @@ msgstr ""
 "přechod k vašemu OpenID poskytovately."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2295,6 +2685,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
@@ -2303,25 +2696,37 @@ msgstr ""
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Tato stránka není k dispozici v typu média která přijímáte."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2333,18 +2738,21 @@ msgstr ""
 "mikroblozích](%%doc.openmublog%%), vložte níže asdresu "
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
 
@@ -2356,15 +2764,22 @@ msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Ne�ekaná forma submission."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Ne�ekané resetování hesla."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr ""
 
@@ -2395,38 +2810,47 @@ msgstr "Odhlásit"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Nepodporovaná verze OMB."
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Nepodporovaný formát obrázku."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Upload"
 
@@ -2445,12 +2869,15 @@ msgid "Upload a new profile image"
 msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
 
@@ -2474,11 +2901,16 @@ msgstr "Úživatel, kterému nasloucháte neexistuje."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Uživatel nemá profil."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Přezdívka"
 
@@ -2487,29 +2919,33 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Co se děje %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Místo. Město, stát."
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Neplatný typ obrázku pro '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Neplatná velikost obrázku '%s'"
@@ -2517,7 +2953,9 @@ msgstr "Neplatná velikost obrázku '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr ""
 
@@ -2538,11 +2976,12 @@ msgid "You are already logged in!"
 msgstr "Již jste přihlášen"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2560,7 +2999,7 @@ msgstr "Můžete vytvožit nový ú�et a za�ít posílat oznámení."
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
@@ -2568,6 +3007,7 @@ msgstr ""
 "Můžete odstranit OpenID z vašeho ú�tu, kliknutím na tla�ítko \"Odebrat\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2576,7 +3016,8 @@ msgstr ""
 "Můžete odesílat nebo přijámat sdělení pomocí Jabber/GTalk [zpráv](%%doc.im%"
 "%).Zadejte svou adresu níže."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2587,21 +3028,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Můžete použít místní odebírání."
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Neodeslal jste nám profil"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2615,35 +3058,39 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr ""
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Byl jste identifikován. Zadejte nové heslo"
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "Vaše OpenID adresa"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Vaše přezdívka na tomto servu, nebo váš email zadaný při registraci"
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2652,47 +3099,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) vám dovoluje použít stejný ú�et na více stránkách. "
 "Zde může spravovat vaše OpenID"
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "před pár sekundami"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "před %d dny"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "asi před %d hodinami"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "asi před %d minutami"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "asi před %d mesíci"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "asi přede dnem"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "asi před minutou"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "asi před měsícem"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "asi před rokem"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "asi před hodinou"
 
@@ -2714,12 +3171,14 @@ msgid "reply"
 msgstr "odpově�"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "stejné jako heslo výše"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr ""
 
@@ -2741,6 +3200,26 @@ msgstr "« Novější"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2749,6 +3228,7 @@ msgid "This notice is not a favorite!"
 msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -2756,22 +3236,28 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2781,11 +3267,13 @@ msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2825,33 +3313,44 @@ msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr ""
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr ""
 
@@ -2905,6 +3404,11 @@ msgstr ""
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr ""
 
@@ -2933,6 +3437,8 @@ msgid "New password successfully saved. "
 msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2953,12 +3459,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2966,7 +3475,7 @@ msgstr ""
 msgid "No such message."
 msgstr ""
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
@@ -2990,51 +3499,70 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
@@ -3053,14 +3581,17 @@ msgid ""
 msgstr ""
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr ""
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr ""
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -3069,6 +3600,7 @@ msgid "Twitter Username"
 msgstr ""
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr ""
 
@@ -3077,24 +3609,29 @@ msgid "Twitter Password"
 msgstr ""
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -3105,33 +3642,43 @@ msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -3148,18 +3695,19 @@ msgid "The subscription has been rejected, but no "
 msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3169,89 +3717,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3259,11 +3829,11 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3278,7 +3848,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -3290,7 +3860,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3299,31 +3869,39 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr ""
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr ""
 
@@ -3336,14 +3914,19 @@ msgid "Twitter integration options"
 msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s a přátelé"
@@ -3353,22 +3936,32 @@ msgid "You can upload your personal avatar."
 msgstr ""
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "Nastavení"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
@@ -3385,35 +3978,44 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "Žádné takové oznámení."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr ""
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "Žádný takový uživatel."
@@ -3422,12 +4024,12 @@ msgstr "Žádný takový uživatel."
 msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 #, fuzzy
 msgid "You have already blocked this user."
 msgstr "Již jste přihlášen"
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3444,40 +4046,58 @@ msgstr ""
 msgid "Add to favorites"
 msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "Žádná přezdívka."
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "Žádné takové oznámení."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3487,16 +4107,17 @@ msgid "Nickname must have only lowercase letters "
 msgstr "Přezdívka může obsahovat pouze malá písmena a �ísla bez mezer"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "Nelze aktualizovat uživatele"
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 #, fuzzy
 msgid "Options saved."
 msgstr "Nastavení uloženo"
@@ -3514,7 +4135,8 @@ msgstr ""
 msgid "Send me email when someone "
 msgstr ""
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3530,7 +4152,7 @@ msgstr ""
 "Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s pro "
 "posílání zpráv."
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3544,54 +4166,69 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "Žádný obsah!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 #, fuzzy
 msgid "After"
 msgstr "« Novější"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "Starší »"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "Feed přítel uživatele: %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3637,12 +4274,14 @@ msgstr ""
 msgid "Sync preferences"
 msgstr "Nastavení"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr ""
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "Žádné takové oznámení."
@@ -3657,7 +4296,8 @@ msgid "The most popular notices on the site right now."
 msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3671,15 +4311,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr ""
 
@@ -3687,12 +4329,14 @@ msgstr ""
 msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "Obrázek nahrán"
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "Nahrávání obrázku selhalo."
@@ -3712,7 +4356,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
@@ -3727,6 +4372,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "Vytvořit nový ú�et"
@@ -3739,7 +4385,7 @@ msgstr ""
 "Hledej uživatele na %%site.name%% podle jejich jména, místa, nebo zájmů. "
 "Minimální délka musí být alespoň 3 znaky"
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "Hledání lidí"
@@ -3763,21 +4409,21 @@ msgstr "Zasílat oznámení pomocí Jabber/GTalk"
 msgid "A confirmation code was sent "
 msgstr "Žádný potvrzující kód."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Již jste přihlášen"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Nelze přesměrovat na server: %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr ""
@@ -3786,16 +4432,19 @@ msgstr ""
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "Žádné takové oznámení."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "Neodeslal jste nám profil"
@@ -3804,21 +4453,25 @@ msgstr "Neodeslal jste nám profil"
 msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr ""
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Nelze vytvořit OpenID z: %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -3830,16 +4483,18 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "Nelze uložin informace o obrázku"
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Nelze vytvořit odebírat"
@@ -3853,12 +4508,15 @@ msgstr "Soubor je příliš velký"
 msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 #, fuzzy
 msgid "Notice posted"
 msgstr "Sdělení"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr ""
 
@@ -3875,7 +4533,7 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "OpenID přihlášení"
@@ -3903,11 +4561,13 @@ msgstr ""
 msgid "Service"
 msgstr "Hledat"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
@@ -3917,17 +4577,18 @@ msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
 msgid "Change your password."
 msgstr "Změnit heslo"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "Heslo uloženo"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Není platnou mailovou adresou."
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -3937,12 +4598,13 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "Neznámý profil"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -3952,21 +4614,26 @@ msgid "Automatically subscribe to whoever "
 msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Neplatná adresa '%s'"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "Nelze uložit profil"
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "Veřejné zprávy"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
@@ -3987,11 +4654,13 @@ msgstr "Veřejný Stream Feed"
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4048,7 +4717,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "Odpovědi na %s"
@@ -4058,53 +4728,74 @@ msgstr "Odpovědi na %s"
 msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "Žádné takové oznámení."
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "Sdělení"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "Feed sdělení pro %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "ÄŒlenem od"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr ""
 
@@ -4119,7 +4810,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4130,32 +4821,39 @@ msgid "'s profile"
 msgstr "Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "Uživatel nemá profil."
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr ""
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr ""
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "Odběratelé"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr ""
 
@@ -4181,7 +4879,7 @@ msgstr "Zasílat oznámení pomocí Jabber/GTalk"
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Tento potvrzující kód vám nepatří!"
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr ""
 
@@ -4245,17 +4943,18 @@ msgstr "Toto jsou lidé, jejiž sdělením %s naslouchá"
 msgid "These are the people whose "
 msgstr "Toto jsou lidé, kteří naslouchají %s sdělením"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "Žádné Jabber ID."
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Mikroblog od %s"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4279,7 +4978,7 @@ msgstr ""
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4289,17 +4988,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "Nelze uložin informace o obrázku"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4308,20 +5007,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "Žádné takové oznámení."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "Mikroblog od %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "Žádný požadavek nebyl nalezen!"
@@ -4330,16 +5032,17 @@ msgstr "Žádný požadavek nebyl nalezen!"
 msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 #, fuzzy
 msgid "Twitter password"
 msgstr "Nové heslo"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr ""
 
@@ -4352,157 +5055,166 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr "Nelze smazat potvrzení emailu"
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "Chyba při ukládaní uživatele"
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "Nebylo vráceno žádné URL profilu od servu."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 #, fuzzy
 msgid "No profile with that id."
 msgstr "Vzdálený profil s nesouhlasícím profilem"
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Odhlásit"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr ""
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Problém při ukládání sdělení"
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 #, fuzzy
 msgid "Upload an avatar"
 msgstr "Nahrávání obrázku selhalo."
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr ""
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr ""
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Account"
 msgstr "O nás"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "Vytvořit nový ú�et"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "Žádné takové OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "Nápověda"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "Nové sdělení"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "Nové sdělení"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Odběry"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "Žádný takový uživatel."
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr ""
 
@@ -4515,12 +5227,15 @@ msgstr ""
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "Vytvořit nový ú�et"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 #, fuzzy
 msgid "Published"
 msgstr "Veřejné"
@@ -4542,34 +5257,39 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
 msgstr "Odběry"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "Popiš sebe a své zájmy ve 140 znacích"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4579,21 +5299,21 @@ msgstr "Místo. Město, stát."
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 #, fuzzy
 msgid "Logo"
 msgstr "Odhlásit"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
@@ -4626,12 +5346,12 @@ msgstr "Přihlásit"
 msgid "Leave"
 msgstr "Uložit"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Neplatné jméno nebo heslo"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Vytvořit nový ú�et"
@@ -4652,24 +5372,24 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1 od te� naslouchá tvým sdělením v %2"
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "Umístění %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Moje stránky: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
@@ -4684,43 +5404,51 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1 od te� naslouchá tvým sdělením v %2"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "Nové sdělení"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 a více znaků"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 #, fuzzy
 msgid "in reply to"
 msgstr "odpověd na ..."
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "odpově�"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr ""
 
@@ -4741,27 +5469,29 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Veřejné"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "Hledání lidí"
@@ -4779,32 +5509,34 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Vzdálený odběr"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Vzdálený odběr"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Uživatel nemá profil."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "Odběr autorizován"
@@ -4818,11 +5550,12 @@ msgid "Top posters"
 msgstr ""
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 #, fuzzy
 msgid "Unblock this user"
 msgstr "Žádný takový uživatel."
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr ""
 
@@ -4830,22 +5563,2019 @@ msgstr ""
 msgid "Unsubscribe from this user"
 msgstr ""
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed přítel uživatele: %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed přítel uživatele: %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed přítel uživatele: %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s a přátelé"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Obrázek nahrán"
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Mikroblog od %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Hledej uživatele na %%site.name%% podle jejich jména, místa, nebo zájmů. "
+"Minimální délka musí být alespoň 3 znaky"
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Hledej \"%s\" ve Streamu"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr "Z bezpe�nostních důvodů, prosím zadejte znovu své jméno a heslo."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Veřejný Stream Feed"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Veřejný Stream Feed"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Veřejný Stream Feed"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní "
+"�íslo."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Vytvořit"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Žádné takové oznámení."
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "Profil"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Obrázek"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Nastavené Profilu"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "Tento potvrzující kód vám nepatří!"
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Žádný takový uživatel."
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Nelze smazat potvrzení emailu"
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete odebírat "
+"sdělení tohoto uživatele. Pokud ne, ask to subscribe to somone's notices, "
+"klikněte na \"Zrušit\""
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"Pokud již máte ú�et, přihlašte se pomocí přezdívky a hesla. A poté propojte "
+"ú�et s OpenID."
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1 naslouchá vašim sdělením na %s. \n"
+"\n"
+"\t%3\n"
+"\n"
+"S úctou váš,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Hledat"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Žádný takový dokument."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Nelze přesměrovat na server: %s"
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Žádný takový uživatel."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Uživatel nemá profil."
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s a přátelé"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Žádný takový uživatel."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Umístění"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Žádné takové oznámení."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Neplatná adresa '%s'"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Přezdívku již někdo používá. Zkuste jinou"
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Nelze uložin informace o obrázku"
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nové sdělení"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nové sdělení"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Není platnou přezdívkou."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Uživatel nemá profil."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Neodeslal jste nám profil"
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Žádný takový uživatel."
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Nelze aktualizovat uživatele"
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Nastavení uloženo"
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Žádné výsledky."
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Uživatel nemá profil."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+msgid "Message sent"
+msgstr ""
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Nelze uložit profil"
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) vám dovoluje použít stejný ú�et na více stránkách. "
+"Zde může spravovat vaše OpenID"
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Nastavené Profilu"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Pokud jste zapomněl nebo stratil heslo, můžete si nechat zaslat nové na vaší "
+"emailovou adresu uloženou u vašeho ú�tu."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Byl jste identifikován. Zadejte nové heslo"
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Žádost o obnovu hesla"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Chyba v ověřovacím kódu"
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Odběr autorizován"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Žádné takové oznámení."
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Žádný takový uživatel."
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1 od te� naslouchá tvým sdělením v %2"
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Nelze aktualizovat uživatele"
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Nelze aktualizovat uživatele"
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1 statusů na %2"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Mikroblog od %s"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Všechny odběry"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Nastavené Profilu"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Neodeslal jste nám profil"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problém při ukládání sdělení"
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Uživatel nemá profil."
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profil"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Upload"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Změnit heslo"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Připojit"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Hledat"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Přihlásit"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Vytvořit nový ú�et"
+msgid "Blocked"
+msgstr "Žádný takový uživatel."
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Nelze potvrdit email"
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Žádný takový uživatel."
 
-#~ msgid "Email address"
-#~ msgstr "Emailová adresa"
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Chyba při vkládání nového sdělení"
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Žádný obsah!"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Hledat"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Stránka není platnou URL."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Žádné takové oznámení."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Nelze přesměrovat na server: %s"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Již jste přihlášen"
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "Pokud jste zapomněl nebo stratil heslo, můžete si nechat zaslat nové na "
-#~ "vaší emailovou adresu uloženou u vašeho ú�tu."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Nelze přesměrovat na server: %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Neodeslal jste nám profil"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Nelze vytvořit OpenID z: %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Profil"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Neodeslal jste nám profil"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Obrázek nahrán"
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Nepodporovaný formát obrázku."
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Mikroblog od %s"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Úživatel, kterému nasloucháte neexistuje."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Neautorizován."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Nelze konvertovat řetězec požadavku na přístupový řetězec."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Neznámá verze OMB protokolu."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Žádné takové oznámení."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Žádné takové oznámení."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Mikroblog od %s"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Tato stránka není k dispozici v typu média která přijímáte."
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste zaregistrován? "
+"[Registrovat](%%action.register%%) nový ú�et, nebo vyzkoušejte [OpenID](%%"
+"action.openidlogin%%)."
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Mikroblog od %s"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Všechny položky obsahující \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Připojit"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Popiš sebe a své zájmy ve 140 znacích"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Popiš sebe a své zájmy ve 140 znacích"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Není platnou adresou profilu (není YADIS dokumentem)."
+
+#: 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 "Nelze získat řetězec požadavku."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Odpovědi na %s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed přítel uživatele: %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed přítel uživatele: %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed přítel uživatele: %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Feed sdělení pro %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Sdělení"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Tato stránka není k dispozici v typu média která přijímáte."
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete odebírat "
+"sdělení tohoto uživatele. Pokud ne, ask to subscribe to somone's notices, "
+"klikněte na \"Zrušit\""
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"Odběr byl potvrzen, ale neprošla žádná callback adresa. Zkontrolujte v "
+"nápovědě jak správně postupovat při potvrzování odběru. Váš řetězec odběru "
+"je:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Odebírání bylo zamítnuto, ale neprošla žádná callback adresa. Zkontrolujte v "
+"nápovědě jak správně postupovat při zamítání odběru"
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Nelze pře�íst adresu obrázku '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Neplatný typ obrázku pro '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Nelze přesměrovat na server: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Nové sdělení"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Nelze aktualizovat uživatele"
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Odpovědi na %s"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problém při ukládání sdělení"
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Žádný potvrzující kód."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Popiš sebe a své zájmy ve 140 znacích"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Popiš sebe a své zájmy ve 140 znacích"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Nové sdělení"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%1 od te� naslouchá tvým sdělením v %2"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " od "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Nelze aktualizovat uživatele"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Nové sdělení"
diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo
index 335b26715..5687793fa 100644
--- a/locale/de/LC_MESSAGES/statusnet.mo
+++ b/locale/de/LC_MESSAGES/statusnet.mo
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index ed0252879..269a68711 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -1,30 +1,30 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to German
 #
+# Author@translatewiki.net: Umherirrender
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-04-28 00:01+0000\n"
-"Last-Translator: Dawid Jan <dawidjan@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:08+0000\n"
+"Language-Team: German\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr "Suche im Stream nach \"%s\""
+msgstr "Suche im Stream nach „%s“"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -37,18 +37,19 @@ msgid " from "
 msgstr "von"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s Antworten an %2$s"
 
-# Nedd a concrete example with full data
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s hat Dich eingeladen, auch bei %2$s mitzumachen."
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -99,11 +100,13 @@ msgstr ""
 "\n"
 "%6$s\n"
 "\n"
-"Wenn nicht, ignoriere diese Nachricht. Danke für Deine Geduld und Deine Zeit\n"
+"Wenn nicht, ignoriere diese Nachricht. Danke für Deine Geduld und Deine "
+"Zeit\n"
 "\n"
 "Schöne Grüße von %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
@@ -126,25 +129,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s Status auf %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s öffentlicher Stream"
@@ -154,34 +160,48 @@ msgstr "%s öffentlicher Stream"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s und Freunde"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s öffentliche Zeitleiste"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s Status"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s Zeitleiste"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s Nachrichten von allen!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -189,7 +209,8 @@ msgstr ""
 "(Sie sollten in Kürze eine E-Mail mit der Anleitung zur Überprüfung Ihrer "
 "Mailadresse erhalten.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -198,7 +219,8 @@ msgstr ""
 "**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
 "site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** ist ein Microbloggingdienst."
@@ -212,32 +234,36 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
 "Pflicht."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 oder mehr Zeichen"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 oder mehr Zeichen, und nicht vergessen!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 oder mehr Buchstaben. Pflicht."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -247,6 +273,7 @@ msgstr ""
 "hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -282,7 +309,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API-Methode nicht gefunden!"
 
@@ -305,16 +359,23 @@ msgstr "API-Methode nicht gefunden!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "API-Methode im Aufbau."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Ãœber"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Akzeptieren"
 
@@ -325,6 +386,9 @@ msgstr "Akzeptieren"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -342,62 +406,71 @@ msgstr "OpenIDs hinzufügen oder löschen"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Adresse"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 "Addressen von Freunden, die Du einladen möchtest. (Jeweils eine Addresse pro "
 "Zeile)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Alle Abonnements"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Alle Aktualisierungen für %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
-msgstr "Alle Aktualisierungen, die den Suchbegriff \"%s\" enthalten"
+msgstr "Alle Aktualisierungen, die den Suchbegriff „%s“ enthalten"
 
 #: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
 #: ../actions/openidlogin.php:29 ../actions/register.php:30
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
-msgstr "Bereits eingeloggt."
+msgstr "Bereits angemeldet."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Bereits abonniert!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Abonnement bestätigen"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "Automatisch einloggen; nicht bei gemeinsam genutzten PCs einsetzen!"
+msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -407,15 +480,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Avatar aktualisiert."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -426,6 +503,7 @@ msgstr ""
 "Freundeliste hinzugefügt?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -434,7 +512,7 @@ msgstr ""
 "(auch den Spam-Ordner) auf eine Nachricht mit weiteren Instruktionen."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Warte auf die Bestätigung dieser Telefonnummer."
 
@@ -445,6 +523,8 @@ msgstr "Ältere"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Biografie"
 
@@ -452,23 +532,27 @@ msgstr "Biografie"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Die Nachricht konnte nicht gelöscht werden."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr "Konnte Avatar-URL nicht öffnen '%s'"
+msgstr "Konnte Avatar-URL nicht öffnen „%s“"
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Konnte neues Passwort nicht speichern"
 
@@ -476,31 +560,34 @@ msgstr "Konnte neues Passwort nicht speichern"
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Konnte kein OpenID consumer Objekt erzeugen."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Konnte diese Jabber ID nicht normalisieren"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Ändern"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Ändere die E-Mail Verarbeitung"
 
@@ -510,11 +597,12 @@ msgid "Change password"
 msgstr "Passwort ändern"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Ändere dein Passwort"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Ändern der Profileinstellungen"
 
@@ -524,6 +612,9 @@ msgstr "Ändern der Profileinstellungen"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -536,12 +627,14 @@ msgstr "Adresse bestätigen"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Bestätigung abgebrochen."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Bestätigungscode"
 
@@ -550,7 +643,8 @@ msgstr "Bestätigungscode"
 msgid "Confirmation code not found."
 msgstr "Bestätigungscode nicht gefunden."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -572,7 +666,7 @@ msgstr ""
 "\n"
 "Danke für deine Anmeldung, wir hoffen das dir der Service gefällt.\n"
 "\n"
-"Als nächstes möchtest du eventuell ...\n"
+"Als nächstes möchtest du eventuell …\n"
 "\n"
 "* zu [deinem Profil gehen](%s) und deine erste Nachricht schreiben\n"
 "* deine [Jabber/GTalk Adresse](%%%%action.imsettings%%%%) eintragen damit du "
@@ -585,20 +679,24 @@ msgstr ""
 "zu erfahren"
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Verbinden"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Verbinde bestehendes Konto"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Konnte OpenID-Formular nicht erstellen: %s"
@@ -606,42 +704,46 @@ msgstr "Konnte OpenID-Formular nicht erstellen: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kann Nutzer %s nicht folgen: schon in deiner Kontaktliste eingetragen"
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Kann Nutzer %s nicht folgen: Nutzer nicht gefunden"
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Konnte nicht zum Server umleiten: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Konnte Avatarinfo nicht speichern"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Neue Profildaten konnten nicht gespeichert werden."
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Die Gegenseite konnte Dich nicht abonnieren."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Konnte nicht abbonieren."
 
 #: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr "Die bestätigte Emailadresse konnte nicht gespeichert werden."
+msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden."
 
 #: ../actions/finishremotesubscribe.php:99
 #: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
@@ -654,15 +756,17 @@ msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
-msgstr "Konnte E-Mailbestätigung nicht löschen."
+msgstr "Konnte E-Mail-Bestätigung nicht löschen."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Konnte Abonnement nicht löschen."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Konnte keine Statusmeldungen finden."
 
@@ -675,29 +779,38 @@ msgstr "Konnte keinen Anfrage-Token bekommen."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Konnte keinen Bestätigungscode einfügen."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Konnte Profil nicht speichern."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Autosubscribe konnte nicht aktiviert werden."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Konnte Nutzereintrag nicht schreiben"
 
@@ -713,42 +826,48 @@ msgstr "Konnte Nutzereintrag nicht schreiben"
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Erstellen"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Neuen Nutzer mit diesem Nicknamen erstellen."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Neues Konto anlegen"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Erzeugen eines Kontos zu einer OpenID, die schon einem Nutzer gehört."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
-msgstr "Aktuelle für den SMS Dienst bestätigte Telefon Nummer"
+msgstr "Aktuelle für den SMS-Dienst bestätigte Telefon-Nummer."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Aktuelle bestätigte E-Mail Adresse"
 
@@ -757,23 +876,27 @@ msgid "Currently"
 msgstr "Momentan"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Notiz löschen"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Beschreibe dich selbst in 140 Zeichen"
 
@@ -781,53 +904,59 @@ msgstr "Beschreibe dich selbst in 140 Zeichen"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "E-Mail"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
-msgstr "E-Mail Adresse"
+msgstr "E-Mail-Adresse"
 
 #: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 #: actions/emailsettings.php:60
 msgid "Email Settings"
-msgstr "E-Mail Einstellungen"
+msgstr "E-Mail-Einstellungen"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
-msgstr "Diese E-Mail Adresse existiert bereits."
+msgstr "Diese E-Mail-Adresse existiert bereits."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
-msgstr "Bestätigung der E-Mail Adresse"
+msgstr "Bestätigung der E-Mail-Adresse"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
-msgstr "E-Mail Adresse, z.B. \"UserName@example.org\""
+msgstr "E-Mail-Adresse, beispielsweise „Benutzername@example.org“"
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
-msgstr "E-Mail Adressen"
+msgstr "E-Mail-Adressen"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
-msgstr "Gib einen Spitznamen oder eine E-Mail Adresse ein."
+msgstr "Gib einen Spitznamen oder eine E-Mail-Adresse ein."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Fehler beim Autorisieren des Tokens"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Fehler beim Verbinden des Nutzers mit der OpenID."
 
@@ -838,39 +967,46 @@ msgstr "Fehler beim Verbinden des Nutzers."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Fehler beim Einfügen des Avatars"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Neues Profil konnte nicht angelegt werden"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Fehler beim Einfügen des entfernten Profils"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Fehler beim Speichern der Adressbestätigung."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Fehler beim Speichern des entfernten Profils"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Fehler bei Speichern des Profils."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Fehler beim Speichern des Nutzers."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Fehler beim Speichern des Nutzers, ungültig."
 
@@ -879,18 +1015,22 @@ msgstr "Fehler beim Speichern des Nutzers, ungültig."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Fehler bei den Nutzereinstellungen."
 
 #: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 #: actions/finishaddopenid.php:131
 msgid "Error updating profile"
-msgstr "Fehler beim Update des Profils"
+msgstr "Fehler beim Aktualisieren des Profils"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
-msgstr "Fehler beim Update des entfernten Profils"
+msgstr "Fehler beim Aktualisieren des entfernten Profils"
 
 #: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 #: actions/recoverpassword.php:86
@@ -898,33 +1038,36 @@ msgid "Error with confirmation code."
 msgstr "Fehler beim Bestätigungscode."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Nick wird bereits verwendet"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Aktualisierung des Avatars fehlgeschlagen."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed der Freunde von %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed der Antworten an %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Feed für den Tag %s"
@@ -939,7 +1082,7 @@ msgstr "Durchsuche den Inhalt der Notices"
 msgid "Find people on this site"
 msgstr "Finde Leute auf dieser Seite"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -952,6 +1095,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Vollständiger Name"
 
@@ -960,23 +1108,33 @@ msgstr "Vollständiger Name"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ihr vollständiger Name ist zu lang (maximal 255 Zeichen)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Hilfe"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Startseite"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -984,22 +1142,28 @@ msgstr "Homepage"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr ""
 "Homepage ist kein gültiger URL. URL´s müssen ein Präfix wie http enthalten."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Ich möchte Einträge per E-Mail veröffentlichen."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM Adresse"
 
@@ -1009,7 +1173,7 @@ msgid "IM Settings"
 msgstr "IM Einstellungen"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1017,77 +1181,84 @@ msgstr ""
 "Wenn du schon ein Konto hast, dann melde dich mit Nutzernamen und Passwort "
 "an, um deine OpenID zu verknüpfen."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
 "Wenn du deinem Konto eine OpenID hinzufügen möchtest, dann trage sie hier "
-"ein und klicke auf \"Hinzufügen\"."
+"ein und klicke auf „Hinzufügen“."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
 "Wenn du dein Passwort vergessen oder verloren hast kannst du dir an die E-"
-"Mail Adresse, die in deinem Account eingetragen ist, ein neues zusenden "
-"lassen."
+"Mail-Adresse, die in deinem Benutzerkonto eingetragen ist, ein neues "
+"zusenden lassen."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Eingehende E-Mail"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
-msgstr "Eingehende E-Mail Adresse entfernt"
+msgstr "Eingehende E-Mail-Adresse entfernt"
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Altes Passwort falsch"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Falscher Benutzername oder Passwort."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 "Anweisungen für die Wiederherstellung deines Passworts wurden an deine "
-"hinterlegte E-Mailadresse geschickt."
+"hinterlegte E-Mail-Adresse geschickt."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr "Ungültiger Avatar-URL '%s'"
+msgstr "Ungültiger Avatar-URL „%s“"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
-msgstr "Ungültige E-Mail Adresse: %s"
+msgstr "Ungültige E-Mail-Adresse: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
-msgstr "Ungültige Homepage '%s'"
+msgstr "Ungültige Homepage „%s“"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
-msgstr "Ungültige Lizenz-URL '%s'"
+msgstr "Ungültige Lizenz-URL „%s“"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Ungültiger Nachrichteninhalt"
 
@@ -1102,13 +1273,13 @@ msgid "Invalid notice url"
 msgstr "Ungültige Nachrichten-URL"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
-msgstr "Ungültige Profil-URL '%s'."
+msgstr "Ungültige Profil-URL „%s“."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "Ungültige Profil-URL (falsches Format)"
 
@@ -1126,28 +1297,35 @@ msgstr "Ungültige Größe."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Einladung(en) verschickt"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Einladung(en) an folgende Personen geschickt:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Einladen"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Lade neue Leute ein"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1159,11 +1337,12 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Diese Jabber ID wird bereits von einem anderen Benutzer verwendet."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1174,12 +1353,14 @@ msgstr ""
 "Programm oder GTalk aufgenommen hast."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Sprache"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)"
 
@@ -1188,7 +1369,15 @@ msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)"
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Aufenthaltsort"
 
@@ -1197,7 +1386,12 @@ msgstr "Aufenthaltsort"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 
@@ -1206,18 +1400,22 @@ msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Einloggen"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Mit [OpenID](%%doc.openid%%) Konto einloggen"
+msgstr "Mit [OpenID](%%doc.openid%%)-Konto anmelden."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1228,94 +1426,108 @@ msgstr ""
 "[Registriere](%%action.register%%) ein neues Konto oder versuche es mit "
 "[OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Abmelden"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
-msgstr "Längerer Name, bevorzugt dein \"echter\" Name"
+msgstr "Längerer Name, bevorzugt dein „echter“ Name"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Passwort vergessen?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
-"Neue Mailadresse für Postings aktivieren; die alte wird automatisch "
+"Neue E-Mail-Adresse für Postings aktivieren; die alte wird automatisch "
 "deaktiviert."
 
 #: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
-msgstr "Einstellen, wie und wann du Emails von %%site.name%% bekommst."
+msgstr "Einstellen, wie und wann du E-Mails von %%site.name%% bekommst."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Mitglied seit"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog von %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, 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 ""
 "Netzbetreiber deines Telefons. Falls du einen Betreiber kennst, der SMS-via-"
-"Email beherrscht, aber noch in der Liste fehlt, schicke uns eine Mail unter "
-"%s."
+"Email beherrscht, aber noch in der Liste fehlt, schicke uns eine Mail unter %"
+"s."
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Meine Texte und Daten sind verfügbar unter"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Neu"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
-msgstr "Neue E-Mail Adresse um auf %s zu schreiben"
+msgstr "Neue E-Mail-Adresse um auf %s zu schreiben"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
-msgstr "Neue Eingangs-Emailadresse hinzugefügt."
+msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Neuer Nutzername"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Neue Nachricht"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
-msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt eingeloggt."
+msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151 actions/login.php:101
@@ -1323,7 +1535,13 @@ msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt eingeloggt."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Nutzername"
 
@@ -1332,7 +1550,12 @@ msgstr "Nutzername"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
 
@@ -1341,49 +1564,60 @@ msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
 "Leerzeichen sind nicht erlaubt."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Nutzername nicht erlaubt."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Nutzername des Nutzers, dem du folgen möchtest"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Nutzername oder E-Mail"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "Nein"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Keine Jabber-ID"
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Keine Bestätigungsanfrage!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Kein Netzanbieter ausgewählt."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Kein Code eingegeben"
 
@@ -1395,22 +1629,28 @@ msgstr "Kein Bestätigungs-Code."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Kein Inhalt!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
-msgstr "Keine E-Mail Adresse."
+msgstr "Keine E-Mail-Adresse."
 
 #: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
 msgstr "Keine ID."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
-msgstr "Keine Eingangs-Emailadresse"
+msgstr "Keine Eingangs-E-Mail-Adresse."
 
 #: ../actions/finishremotesubscribe.php:65
 #: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
@@ -1419,6 +1659,7 @@ msgstr "Der entferne Server hat keinen Nutzernamen geliefert."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Kein Nutzername."
 
@@ -1426,12 +1667,14 @@ msgstr "Kein Nutzername."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Keine Telefonnummer."
 
@@ -1441,9 +1684,10 @@ msgid "No profile URL returned by server."
 msgstr "Der entfernte Server hat keine Profil-URL geliefert."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
-msgstr "Der Nutzer hat keine registrierte E-Mailadresse."
+msgstr "Der Nutzer hat keine registrierte E-Mail-Adresse."
 
 #: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 #: actions/userauthorization.php:57
@@ -1453,7 +1697,7 @@ msgstr "Keine Anfrage gefunden!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Keine Ergebnisse"
 
@@ -1462,16 +1706,18 @@ msgstr "Keine Ergebnisse"
 msgid "No size."
 msgstr "Keine Größe."
 
-# Duplicate with: "No status with that ID found."
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Keine Nachricht mit dieser ID gefunden."
 
-# Duplicate with: "No status found with that ID."
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Keine Nachricht mit dieser ID gefunden."
 
@@ -1481,13 +1727,15 @@ msgid "No such OpenID."
 msgstr "Diese OpenID ist nicht bekannt."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Unbekanntes Dokument."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Unbekannte Nachricht."
 
@@ -1525,14 +1773,24 @@ msgstr "Unbekanntes Abonnement"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
-msgstr "Kein Benutzer mit dieser E-Mail Adresse oder mit diesem Nutzernamen."
+msgstr "Kein Benutzer mit dieser E-Mail-Adresse oder mit diesem Nutzernamen."
 
 #: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
@@ -1544,32 +1802,38 @@ msgid "Not a recovery code."
 msgstr "Kein Wiederherstellungscode."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Kein registrierter Nutzer."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Kein unterstütztes Datenformat."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Ungültige OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Ungültige E-Mail-Adresse"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Ungültige E-Mail-Adresse."
 
@@ -1577,6 +1841,11 @@ msgstr "Ungültige E-Mail-Adresse."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Ungültiger Nutzername."
 
@@ -1596,7 +1865,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Ungültige Profil-URL (kein YADIS-Dokument)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Kein Bild oder defekte Datei."
 
@@ -1607,11 +1877,13 @@ msgstr "Nicht autorisiert."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Unerwartete Antwort!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Nicht gefunden"
 
@@ -1627,11 +1899,15 @@ msgstr "Nicht gefunden"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
-msgstr "Nicht eingeloggt."
+msgstr "Nicht angemeldet."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Nicht abonniert!"
 
@@ -1648,39 +1924,44 @@ msgid "Notice feed for %s"
 msgstr "Feed der Nachrichten von %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Nachricht hat kein Profil"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Nachrichten"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Nachrichten, die mit %s getagt sind"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Altes Passwort"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
-msgstr "OpenID Account erstellen"
+msgstr "OpenID-Benutzerkonto erstellen"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "OpenID Automatische Ãœbertragung"
 
@@ -1688,29 +1969,34 @@ msgstr "OpenID Automatische Ãœbertragung"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
-msgstr "OpenID Anmeldung"
+msgstr "OpenID-Anmeldung"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID-URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "OpenID-Authentifizierung abgebrochen."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID-Authentifizierung fehlgeschlagen: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID-Fehler: %s"
@@ -1726,15 +2012,16 @@ msgid "OpenID settings"
 msgstr "OpenID-Einstellungen"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 "Wenn du möchtest kannst du zu der Einladung eine persönliche Nachricht "
 "anfügen."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
-msgstr "Unvollständiger Upload"
+msgstr "Unvollständiges Hochladen."
 
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
 #: ../actions/register.php:153 ../lib/settingsaction.php:93
@@ -1742,34 +2029,46 @@ msgstr "Unvollständiger Upload"
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Passwort"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Passwort und seine Bestätigung stimmen nicht überein."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Passwort muss mehr als 6 Zeichen enthalten"
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Wiederherstellung des Passworts angefordert"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Passwörter stimmen nicht überein."
 
@@ -1789,14 +2088,17 @@ msgid "People search"
 msgstr "Suche nach anderen Nutzern"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Eigene"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Private Nachricht"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
 
@@ -1808,10 +2110,10 @@ msgid ""
 msgstr ""
 "Bitte überprüfe diese Angaben, um sicher zu gehen, dass du die Nachrichten "
 "dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
-"\"Abbrechen\"."
+"„Abbrechen“."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk Status verändert."
 
@@ -1820,7 +2122,9 @@ msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk Status verändert."
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -1829,42 +2133,52 @@ msgstr "Einstellungen"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Privatsphäre"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Problem bei Speichern der Nachricht."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profil"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "Profil-URL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
-msgstr "Profil Einstellungen"
+msgstr "Profil-Einstellungen"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Profil unbekannt"
 
@@ -1873,19 +2187,21 @@ msgid "Public Stream Feed"
 msgstr "Feed des öffentlichen Streams"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Öffentliche Zeitleiste"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "MicroID für meine Jabber/GTalk-Adresse veröffentlichen."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
-msgstr "MicroID für meine Emailadresse veröffentlichen."
+msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
 
 #: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
@@ -1893,12 +2209,14 @@ msgid "Recent Tags"
 msgstr "Neueste Tags"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Wiederherstellung"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Stelle Passwort wieder her"
 
@@ -1911,37 +2229,45 @@ msgstr "Wiederherstellungscode für unbekannten Nutzer."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrieren"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Registrierung nicht gestattet"
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Ablehnen"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Entferntes Profil ohne ein passendes Profil"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Entferntes Abonnement"
 
@@ -1955,6 +2281,9 @@ msgstr "Entferntes Abonnement"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1963,62 +2292,70 @@ msgstr "Entfernen"
 msgid "Remove OpenID"
 msgstr "Entferne OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Wenn du deine einzige OpenID entfernst, kannst du dich nicht mehr einloggen! "
+"Wenn du deine einzige OpenID entfernst, kannst du dich nicht mehr anmelden! "
 "Falls du sie also entfernen musst, füge zuerst eine neue OpenID hinzu."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Antworten"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Antworten an %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Zurücksetzen"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
-msgstr "SMS Telefonnummer"
+msgstr "SMS-Telefonnummer"
 
 #: ../actions/smssettings.php:33 actions/smssettings.php:33
 #: actions/smssettings.php:58
 msgid "SMS Settings"
-msgstr "SMS Einstellungen"
+msgstr "SMS-Einstellungen"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
-msgstr "SMS Konfiguration"
+msgstr "SMS-Konfiguration"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Gleiches Passwort wie zuvor"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
 
@@ -2031,12 +2368,21 @@ msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Speichern"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Suchen"
 
@@ -2046,7 +2392,7 @@ msgid "Search Stream Feed"
 msgstr "Stream-Feed suchen"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2056,7 +2402,7 @@ msgstr ""
 "Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus mindestens 3 "
 "Zeichen bestehen."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2067,33 +2413,38 @@ msgstr ""
 "mindestens 3 Zeichen bestehen."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Wähle einen Netzanbieter"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Senden"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
-msgstr "Schicke ein Mail an diese Adresse um eine Nachricht zu posten."
+msgstr "Schicke ein E-Mail an diese Adresse um eine Nachricht zu posten."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
-msgstr "Informiere mich über neues Abonnements per Mail."
+msgstr "Informiere mich über neues Abonnements per E-Mail."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2102,17 +2453,20 @@ msgstr ""
 "meinem Netzbetreiber entstehen können."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Schicke mir Antworten von Leuten, die ich nicht abonniert habe, mit "
-"Jabber/GTalk."
+"Schicke mir Antworten von Leuten, die ich nicht abonniert habe, mit Jabber/"
+"GTalk."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Einstellungen"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
@@ -2132,27 +2486,32 @@ msgid "Something weird happened."
 msgstr "Etwas eigenartiges ist passiert."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Sorry, keinen eingehenden E-Mails gestattet."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
-msgstr "Sorry, das ist nicht deine Addresse für eingehende E-Mails."
+msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Quellcode"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Statistiken"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Gespeicherte OpenID nicht gefunden."
 
@@ -2160,24 +2519,28 @@ msgstr "Gespeicherte OpenID nicht gefunden."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Abonnieren"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abonnenten"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Abonnement autorisiert"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Abonnement abgelehnt"
 
@@ -2185,28 +2548,35 @@ msgstr "Abonnement abgelehnt"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abonnements"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Systemfehler beim hochladen der Datei."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Tags"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Text"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Volltextsuche"
 
@@ -2226,8 +2596,9 @@ msgid "That confirmation code is not for you!"
 msgstr "Dieser Bestätigungscode ist nicht für dich!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
-msgstr "Diese E-Mail Adresse gehört einem anderen Nutzer."
+msgstr "Diese E-Mail-Adresse gehört einem anderen Nutzer."
 
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
 #: lib/imagefile.php:71
@@ -2235,78 +2606,91 @@ msgid "That file is too big."
 msgstr "Diese Datei ist zu groß."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Diese JabberID hast du schon angegeben."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
-msgstr "Dies ist bereits deine E-Mail Adresse."
+msgstr "Dies ist bereits deine E-Mail-Adresse."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Dies ist bereits deine Telefonnummer."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Dies ist nicht deine JabberID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
-msgstr "Dies ist nicht deine E-Mail Adresse."
+msgstr "Dies ist nicht deine E-Mail-Adresse."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Dies ist nicht deine Telefonnummer."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Das ist die falsche IM Adresse."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Die Bestätigungsnummer ist falsch."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Diese Telefonnummer wird bereits von einem anderen Benutzer verwendet."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 "Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen beschränkt."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 "Das war zu lang. Die Länge einer Nachricht ist auf 255 Zeichen beschränkt."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Die Adresse \"%s\" wurde für dein Konto bestätigt."
+msgstr "Die Adresse „%s“\" wurde für dein Konto bestätigt."
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "Die Adresse wurde entfernt."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2316,7 +2700,8 @@ msgstr ""
 "zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
 "bestätigt werden. Dein Abonnement-Token ist:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2327,51 +2712,56 @@ msgstr ""
 "vollständig abgelehnt werden. Dein Abonnement-Token ist:"
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Dies sind die Leute, die %ss Nachrichten lesen."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Dies sind die Leute, die deine Nachrichten lesen."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Dies sind die Leute, deren Nachrichten %s liest."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Dies sind die Leute, deren Nachrichten du liest."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Diese Leute sind bereits registrierte Benutzer und Du hast Sie automatisch "
 "abonniert."
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Der Bestätigungscode ist zu alt. Bitte fange nochmal von vorne an."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
 "Dieses Formular sollte automatisch übermittelt werden. Wenn nicht, dann "
-"klicke auf \"Senden\", um zu deinem OpenID-Anbieter zu gelangen."
+"klicke auf „Senden“, um zu deinem OpenID-Anbieter zu gelangen."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"Dies ist das erste Mail, dass du dich bei %s einloggst. Deshalb müssen wir "
+"Dies ist das erste Mal, dass du dich bei %s anmeldest. Deshalb müssen wir "
 "deine OpenID mit einem lokalen Konto verbinden. Du kannst entweder ein neues "
 "Konto erstellen oder mit einem vorhandenen Konto anmelden."
 
@@ -2379,6 +2769,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Diese Methode benötigt ein POST oder DELETE."
 
@@ -2387,50 +2780,65 @@ msgstr "Diese Methode benötigt ein POST oder DELETE."
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Diese Methode benötigt ein POST."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Zeitzone"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Keine Zeitzone ausgewählt."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: 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 ""
-"Für ein Abonnement kannst du dich entweder [einloggen](%%action.login%%) "
-"oder ein neues Konto [registrieren](%%action.register%%). Wenn du schon ein "
-"Konto auf einer [kompatiblen Microbloggingsite](%%doc.openmublog%%) hast, "
-"dann gib deine Profil-URL unten an."
+"Für ein Abonnement kannst du dich entweder [anmelden](%%action.login%%) oder "
+"ein neues Konto [registrieren](%%action.register%%). Wenn du schon ein Konto "
+"auf einer [kompatiblen Microbloggingsite](%%doc.openmublog%%) hast, dann gib "
+"deine Profil-URL unten an."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Zwei IDs oder Benutzernamen müssen angegeben werden."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 "URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
 
@@ -2442,15 +2850,22 @@ msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Unerwarteter Passwortreset."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Unbekannter Befehl"
 
@@ -2481,38 +2896,47 @@ msgstr "Abbestellen"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Nicht unterstützte OMB-Version"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Bildformat wird nicht unterstützt."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
-msgstr "Updates via SMS"
+msgstr "Aktualisierungen via SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
-msgstr "Updates via Instant Messenger (IM)"
+msgstr "Aktualisierungen via Instant Messenger (IM)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Updates von %1$s und Freunden auf %2$s!"
+msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
-msgstr "Updates von %1$s auf %2$s!"
+msgstr "Aktualisierungen von %1$s auf %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -2523,7 +2947,7 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Hier kannst du einen neuen \"Avatar\" (Nutzerbild) hochladen. Du kannst das "
+"Hier kannst du einen neuen „Avatar“ (Nutzerbild) hochladen. Du kannst das "
 "Bild nach dem Hochladen nicht mehr verändern, also stell bitte sicher, dass "
 "es halbwegs quadratisch ist. Es muss auch unter der Lizenz der Site zur "
 "Verfügung gestellt werden. Nutze also ein Bild, das dir gehört und das du "
@@ -2534,12 +2958,15 @@ msgid "Upload a new profile image"
 msgstr "Neues Bild für dein Profil hochladen"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "Lade deine Freunde und Kollegen ein diesen Dienst zu nutzen."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Wird nur für Updates, wichtige Mitteilungen und zur "
@@ -2565,11 +2992,16 @@ msgstr "Aufgeführte Nutzer existiert nicht."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Benutzer hat kein Profil."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Benutzername"
 
@@ -2578,37 +3010,43 @@ msgid "User not found."
 msgstr "Benutzer nicht gefunden."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "In welcher Zeitzone befinden Sie sich üblicherweise?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Was ist los, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Wo du bist, z.B. \"Stadt, Gebiet, Land\""
+msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“"
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
-msgstr "Falscher Bildtyp für '%s'"
+msgstr "Falscher Bildtyp für „%s“"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
-msgstr "Falsche Bildgröße bei '%s'"
+msgstr "Falsche Bildgröße bei „%s“"
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Ja"
 
@@ -2631,11 +3069,12 @@ msgid "You are already logged in!"
 msgstr "Du bist bereits angemeldet!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Du hast diese Benutzer bereits abonniert:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "Der angebene Benutzer gehört nicht zu Deinem Freunde-Netzwerk"
 
@@ -2651,17 +3090,18 @@ msgstr "Du kannst ein neues Konto erstellen, um Nachrichten zu verschicken."
 #: actions/smssettings.php:69
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Du kannst SMS per Mail empfangen von %%site.name%%."
+msgstr "Du kannst SMS per E-Mail empfangen von %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Du kannst eine OpenID aus deinem Konto entfernen, indem du auf \"Entfernen\" "
+"Du kannst eine OpenID aus deinem Konto entfernen, indem du auf „Entfernen“ "
 "klickst."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2670,7 +3110,8 @@ msgstr ""
 "Du kannst Nachrichten mittels [Jabber/GTalk IM](%%doc.im%%) empfangen und "
 "senden. Stelle deine Adresse und Einstellungen unten ein."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2681,24 +3122,25 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Du kannst ein lokales Abonnement erstellen!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Dieses Profil hast du uns nicht geschickt"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
-#, fuzzy
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -2711,27 +3153,27 @@ msgid ""
 msgstr ""
 "Du hast eine neue Adresse zum Hinzufügen von Nachrichten auf %1$s.\n"
 "\n"
-"Schicke eine E-mail an %2$s um eine neue Nachricht hinzuzufügen.\n"
+"Schicke eine E-Mail an %2$s um eine neue Nachricht hinzuzufügen.\n"
 "\n"
-"Weitere E-Mailanweisungen unter %3$s.\n"
+"Weitere E-Mail-Anweisungen unter %3$s.\n"
 "\n"
 "Viele Grüße,\n"
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-#, fuzzy
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
-#, fuzzy
 msgid "You must be logged in to invite other users to use %s"
 msgstr "Du musst angemeldet sein, um andere Benutzer zu %s einzuladen"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-#, fuzzy
+#: actions/invite.php:144 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!"
@@ -2740,21 +3182,21 @@ msgstr ""
 "die Empfänger auf der Seite registriert haben. Danke, dass du uns hilfst zu "
 "wachsen!"
 
-#: ../actions/recoverpassword.php:149
-#, fuzzy
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Du wurdest indentifiziert. Bitte trage unten ein neues Passwort ein."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
-msgstr "Deine OpenID URL"
+msgstr "Deine OpenID-URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
-msgstr "Dein Benutzername oder E-Mail Adresse auf diesem Server."
+msgstr "Dein Benutzername oder E-Mail-Adresse auf diesem Server."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2763,47 +3205,57 @@ msgstr ""
 "Mit [OpenID](%%doc.openid%%) kannst du dich bei mehreren Sites mit demselben "
 "Nutzerkonto anmelden. Hier kannst du deine verknüpften OpenIDs verwalten."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "vor %d Tagen"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "vor %d Stunden"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "vor %d Minuten"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "vor %d Monaten"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "vor einem Jahr"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
@@ -2815,9 +3267,8 @@ msgstr "löschen"
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
 #: ../lib/stream.php:117 actions/noticesearch.php:136
 #: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-#, fuzzy
 msgid "in reply to..."
-msgstr "als Antwort auf..."
+msgstr "als Antwort auf …"
 
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
 #: ../lib/stream.php:124 actions/noticesearch.php:143
@@ -2826,13 +3277,14 @@ msgid "reply"
 msgstr "antworten"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-#, fuzzy
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "Gleiches Passwort wie oben"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "Nicht unterstützter Dateityp"
 
@@ -2853,45 +3305,66 @@ msgstr "Früher"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-#, fuzzy
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
 #: actions/disfavor.php:55 actions/disfavor.php:81
-#, fuzzy
 msgid "This notice is not a favorite!"
 msgstr "Diese Nachricht ist kein Favorit!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Konnte Favoriten nicht löschen."
 
 #: actions/disfavor.php:72 lib/favorform.php:140
-#, fuzzy
 msgid "Favor"
 msgstr "Zu Favoriten hinzufügen"
 
-#: actions/emailsettings.php:92
-#, fuzzy
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Mir eine E-Mail schicken, wenn jemand meine Nachricht als Favorit speichert."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
-#, fuzzy
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-#, fuzzy
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Diese Nachricht ist bereits ein Favorit!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Konnte keinen Favoriten erstellen."
 
@@ -2902,26 +3375,24 @@ msgstr "Aus Favoriten entfernen"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
-#, fuzzy
 msgid "%s favorite notices"
 msgstr "%ss Favoriten"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
-#, fuzzy
 msgid "Feed of favorite notices of %s"
 msgstr "Feed von %ss Favoriten"
 
 #: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
-#, fuzzy
 msgid "Inbox for %s - page %d"
 msgstr "Posteingang von %s - Seite %d"
 
 #: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
-#, fuzzy
 msgid "Inbox for %s"
 msgstr "Posteingang von %s"
 
@@ -2934,7 +3405,6 @@ msgstr ""
 
 #: actions/invite.php:178 actions/invite.php:213
 #, php-format
-#, fuzzy
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
@@ -2944,62 +3414,67 @@ msgstr ""
 
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
-#, fuzzy
 msgid "Automatically login in the future; "
 msgstr "In Zukunft automatisch anmelden; "
 
 #: actions/login.php:122 actions/login.php:264
-#, fuzzy
 msgid "For security reasons, please re-enter your "
-msgstr "Aus Sicherheitsgründen, bitte erneutes Eingeben des "
+msgstr "Aus Sicherheitsgründen, bitte erneut eingeben "
 
 #: actions/login.php:126 actions/login.php:268
-#, fuzzy
 msgid "Login with your username and password. "
 msgstr "Anmelden mit deinem Benutzernamen und Passwort. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-#, fuzzy
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
-msgstr "Das ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen."
+msgstr ""
+"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Kein Empfänger angegeben."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-#, fuzzy
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Schicke dir selbst keine Nachrichten; sag es dir stattdessen einfach leise."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "Kein solcher Benutzer"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Neue Nachricht"
 
 #: actions/noticesearch.php:95 actions/noticesearch.php:146
-#, fuzzy
 msgid "Notice without matching profile"
 msgstr "Nachricht ohne entsprechendes Profil"
 
 #: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
-#, fuzzy
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
 "Mit [OpenID](%%doc.openid%%) kannst du dich auf mehreren Seiten anmelden "
@@ -3009,41 +3484,36 @@ msgid "If you want to add an OpenID to your account, "
 msgstr "Wenn du deinem Konto eine OpenID hinzufügen möchtest, "
 
 #: actions/openidsettings.php:74
-#, fuzzy
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
 "Das Entfernen deiner einzigen OpenID würde die Anmeldung unmöglich machen!"
 
 #: actions/openidsettings.php:87 actions/openidsettings.php:143
-#, fuzzy
 msgid "You can remove an OpenID from your account "
 msgstr "Du kannst eine OpenID von deinem Konto entfernen "
 
 #: actions/outbox.php:28 actions/outbox.php:58
-#, fuzzy, php-format
+#, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Postausgang von %s - Seite %d"
 
 #: actions/outbox.php:30 actions/outbox.php:61
-#, fuzzy, php-format
+#, php-format
 msgid "Outbox for %s"
 msgstr "Postausgang von %s"
 
 #: actions/outbox.php:53 actions/outbox.php:116
-#, fuzzy
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Das hier ist dein Postausgang, er beinhaltet deine gesendeten Nachrichten."
 
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
-#, fuzzy
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Suche nach Leuten auf %%site.name%% nach Name, Ort oder Interessen."
+msgstr "Suche nach Leuten auf %%site.name%% nach Name, Ort oder Interessen. "
 
 #: actions/profilesettings.php:27 actions/profilesettings.php:69
-#, fuzzy
 msgid "You can update your personal profile info here "
 msgstr "Du kannst dein persönliches Profil hier aktualisieren "
 
@@ -3052,7 +3522,11 @@ msgstr "Du kannst dein persönliches Profil hier aktualisieren "
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
-#, fuzzy
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Benutzer ohne passendes Profil"
 
@@ -3061,22 +3535,18 @@ msgid "This confirmation code is too old. "
 msgstr "Dieser Bestätigungscode ist zu alt. "
 
 #: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-#, fuzzy
 msgid "If you've forgotten or lost your"
 msgstr "Keine Erinnerung mehr an dein"
 
 #: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-#, fuzzy
 msgid "You've been identified. Enter a "
 msgstr "Du wurdest identifiziert. Eingabe eines "
 
 #: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-#, fuzzy
 msgid "Your nickname on this server, "
 msgstr "Dein Benutzername auf diesem Server, "
 
 #: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-#, fuzzy
 msgid "Instructions for recovering your password "
 msgstr "Anweisungen zur Passwort-Wiederherstellung "
 
@@ -3085,6 +3555,8 @@ msgid "New password successfully saved. "
 msgstr "Neues Passwort erfolgreich gespeichert. "
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
 
@@ -3095,115 +3567,124 @@ msgid ""
 "want to..."
 msgstr ""
 "Gratuliere, %s! Und willkommen auf %%%%site.name%%%%. Jetzt möchtest du "
-"vielleicht..."
+"vielleicht …"
 
 #: actions/register.php:227
-#, fuzzy
 msgid "(You should receive a message by email momentarily, with "
 msgstr "(Du solltest jeden Moment eine E-Mail erhalten mit "
 
 #: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
-#, fuzzy
 msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "Zum Abonnieren bitte [anmelden](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
-#, fuzzy
 msgid "Feed for favorites of %s"
 msgstr "Feed der Favoriten von %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-#, fuzzy
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Konnte Favoriten nicht abrufen."
 
 #: actions/showmessage.php:33 actions/showmessage.php:81
-#, fuzzy
 msgid "No such message."
 msgstr "Keine derartige Nachricht."
 
-#: actions/showmessage.php:42
-#, fuzzy
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
-msgstr "Nur der Absender und Empfänger können diese Nachricht lesen."
+msgstr "Nur der Absender und der Empfänger können diese Nachricht lesen."
 
 #: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
-#, fuzzy
 msgid "Message to %1$s on %2$s"
 msgstr "Nachricht an %1$s auf %2$s"
 
 #: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
-#, fuzzy
 msgid "Message from %1$s on %2$s"
 msgstr "Nachricht von %1$s auf %2$s"
 
 #: actions/showstream.php:154
-#, fuzzy
 msgid "Send a message"
 msgstr "Eine Nachricht verschicken"
 
 #: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
-#, fuzzy
 msgid "Mobile carrier for your phone. "
 msgstr "Mobilfunkanbieter deines Telefons. "
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direkte Nachricht an %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alle an %s gesendeten direkten Nachrichten"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Von dir gesendete direkte Nachrichten"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Alle von %s gesendeten direkten Nachrichten"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Fehlender Nachrichtentext!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Empfänger nicht gefunden."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
-#, fuzzy
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
 "du nicht befreundet bist."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
-#, fuzzy
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoriten von %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
-#, fuzzy
 msgid "%s updates favorited by %s / %s."
-msgstr "%s Updates in den Favoriten von %s / %s."
+msgstr "%s Aktualisieurng in den Favoriten von %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s hat deine Nachricht als Favorit gespeichert"
@@ -3211,7 +3692,6 @@ msgstr "%s hat deine Nachricht als Favorit gespeichert"
 #: actions/twitapifavorites.php:188 lib/mail.php:276
 #: actions/twitapifavorites.php:165
 #, php-format
-#, fuzzy
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -3220,7 +3700,6 @@ msgstr ""
 "\n"
 
 #: actions/twittersettings.php:27
-#, fuzzy
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
@@ -3228,44 +3707,50 @@ msgstr ""
 "zu übermitteln, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
-msgstr "Twitter Einstellungen"
+msgstr "Twitter-Einstellungen"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
-msgstr "Twitter Konto"
+msgstr "Twitter-Konto"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
-msgstr "Derzeit bestätigter Twitter Account."
+msgstr "Derzeit bestätigtes Twitter-Konto."
 
 #: actions/twittersettings.php:63
 msgid "Twitter Username"
-msgstr "Twitter Benutzername"
+msgstr "Twitter-Benutzername"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Keine Leerzeichen, bitte."
 
 #: actions/twittersettings.php:67
 msgid "Twitter Password"
-msgstr "Twitter Passwort"
+msgstr "Twitter-Passwort"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Sende meine Nachrichten automatisch an Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
-#, fuzzy
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
-msgstr "Sende lokale \"@\" Antworten an Twitter."
+msgstr "Sende lokale „@“-Antworten an Twitter."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
-msgstr "Hier meine Twitter Freunde abonnieren."
+msgstr "Hier meine Twitter-Freunde abonnieren."
 
-#: actions/twittersettings.php:122
-#, fuzzy
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3274,81 +3759,84 @@ msgstr ""
 "(_) enthalten. Maximal 15 Zeichen."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
-#, fuzzy
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
-msgstr "Das Überprüfen deiner Twitter Berechtigungen war nicht erfolgreich!"
+msgstr "Das Überprüfen deiner Twitter-Berechtigungen war nicht erfolgreich!"
 
 #: actions/twittersettings.php:137
 #, php-format
-#, fuzzy
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
-"Es konnten keine Kontoinformationen zu \"%s\" von Twitter empfangen werden."
+"Es konnten keine Kontoinformationen zu „%s“ von Twitter empfangen werden."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
-msgstr "Konnte Twitter Einstellungen nicht speichern!"
+msgstr "Konnte Twitter-Einstellungen nicht speichern!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
-msgstr "Twitter Einstellungen gespeichert."
+msgstr "Twitter-Einstellungen gespeichert."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
-msgstr "Das ist nicht dein Twitter Konto."
+msgstr "Das ist nicht dein Twitter-Konto."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
-msgstr "Konnte Twitter Benutzer nicht entfernen."
+msgstr "Konnte Twitter-Benutzer nicht entfernen."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
-msgstr "Twitter Account entfernt."
+msgstr "Twitter-Konto entfernt."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
-msgstr "Konnte Twitter Einstellungen nicht speichern."
+msgstr "Konnte Twitter-Einstellungen nicht speichern."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
-msgstr "Twitter Einstellungen gespeichert."
+msgstr "Twitter-Einstellungen gespeichert."
 
 #: actions/userauthorization.php:84 actions/userauthorization.php:86
-#, fuzzy
 msgid "Please check these details to make sure "
 msgstr "Bitte überprüfe die Details um sicherzustellen, dass "
 
 #: actions/userauthorization.php:324 actions/userauthorization.php:340
-#, fuzzy
 msgid "The subscription has been authorized, but no "
 msgstr "Das Abonnement wurde genehmigt, aber kein "
 
 #: actions/userauthorization.php:334 actions/userauthorization.php:351
-#, fuzzy
 msgid "The subscription has been rejected, but no "
 msgstr "Das Abonnement wurde abgelehnt, aber kein "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-#, fuzzy
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
-msgstr "Befehl Ausgabe"
+msgstr "Befehl-Ergebnisse"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-#, fuzzy
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Befehl ausgeführt"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-#, fuzzy
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Befehl fehlgeschlagen"
 
-#: classes/Command.php:39 classes/Command.php:44
-#, fuzzy
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Leider ist dieser Befehl noch nicht implementiert."
 
@@ -3358,95 +3846,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "Abonnements: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-#, fuzzy
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "Benutzer hat keine letzte Nachricht"
 
-#: classes/Command.php:146 classes/Command.php:166
-#, fuzzy
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Nachricht als Favorit markiert."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Vollständiger Name: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
-#, fuzzy, php-format
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
+#, php-format
 msgid "Location: %s"
 msgstr "Standort: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Ãœber: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Direkte Nachricht an %s abgeschickt"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Fehler beim Senden der Nachricht"
 
-#: classes/Command.php:263 classes/Command.php:300
-#, fuzzy
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
-msgstr "Gib den Namen des Benutzers den du abonnieren möchtest an"
+msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "%s abonniert"
 
-#: classes/Command.php:288 classes/Command.php:328
-#, fuzzy
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
-#, fuzzy
 msgid "Unsubscribed from %s"
 msgstr "%s nicht mehr abonniert"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-#, fuzzy
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Befehl noch nicht implementiert."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Benachrichtigung deaktiviert."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "Konnte Benachrichtigung nicht deaktivieren."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Benachrichtigung aktiviert."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Konnte Benachrichtigung nicht aktivieren."
 
@@ -3454,12 +3958,12 @@ msgstr "Konnte Benachrichtigung nicht aktivieren."
 msgid "Commands:\n"
 msgstr "Befehle:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 #, fuzzy
 msgid "Could not insert message."
 msgstr "Konnte Nachricht nicht einfügen."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 #, fuzzy
 msgid "Could not update message with new URI."
 msgstr "Konnte Nachricht nicht mit neuer URI versehen."
@@ -3478,7 +3982,7 @@ msgstr ""
 "Du hast eine neue Adresse zum Hinzufügen von Nachrichten auf %1$s.\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "Neue private Nachricht von %s"
@@ -3492,7 +3996,7 @@ msgstr ""
 "%1$s (%2$s) hat dir einen private Nachricht geschickt:\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 #, fuzzy
 msgid "Only the user can read their own mailboxes."
 msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen."
@@ -3503,32 +4007,39 @@ msgid "This form should automatically submit itself. "
 msgstr "Dieses Formular sollte sich automatisch abschicken. "
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Favoriten"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-#, fuzzy
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
+#, fuzzy, php-format
 msgid "%s's favorite notices"
 msgstr "%ss favorisierte Nachrichten"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Benutzer"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Posteingang"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Deine eingehenden Nachrichten"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Postausgang"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Deine gesendeten Nachrichten"
 
@@ -3538,18 +4049,23 @@ msgstr "Twitter"
 
 #: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
-msgstr "Twitter Integrationseinstellungen"
+msgstr "Twitter-Integrationseinstellungen"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "An"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 #, fuzzy
 msgid "Could not parse message."
 msgstr "Konnte Nachricht nicht parsen."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s und Freunde, Seite %d"
@@ -3559,21 +4075,31 @@ msgid "You can upload your personal avatar."
 msgstr "Du kannst dein persönliches Avatar hochladen."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
-msgstr "Avatar Einstellungen"
+msgstr "Avatar-Einstellungen"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Vorschau"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Zuschneiden"
 
@@ -3591,38 +4117,47 @@ msgid "There was a problem with your session token. "
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 "Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 #, fuzzy
 msgid "Lost our file data."
 msgstr "Daten verloren."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "Daten verloren."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "Unbekannter Dateityp"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "Kein Profil angegeben."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "Kein Benutzer-Profil mit dieser ID."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Benutzer blockieren"
 
@@ -3630,19 +4165,19 @@ msgstr "Benutzer blockieren"
 msgid "Are you sure you want to block this user? "
 msgstr "Bist du sicher, dass du diesen Benutzer blockieren möchtest? "
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Du hast diesen Benutzer bereits blockiert."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 #, fuzzy
 msgid "Failed to save block information."
 msgstr "Konnte Blockierungsdaten nicht speichern."
 
 #: actions/confirmaddress.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "The address \"%s\" has been "
-msgstr "Die Adresse \"%s\" wurde "
+msgstr "Die Adresse „%s“ wurde "
 
 #: actions/deletenotice.php:73
 #, fuzzy
@@ -3654,41 +4189,59 @@ msgstr "Du bist dabei diese Nachricht dauerhaft zu entfernen. "
 msgid "Add to favorites"
 msgstr "Zu Favoriten hinzufügen"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Gruppe %s bearbeiten"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 #, fuzzy
 msgid "Inboxes must be enabled for groups to work"
 msgstr "Posteingänge müssen aktiviert sein, damit Gruppen funktionieren"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "Kein Benutzername"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "Keine derartige Gruppe"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Du musst ein Administrator sein, um die Gruppe zu bearbeiten"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
 
@@ -3698,14 +4251,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr "Der Benutzername darf nur aus Kleinbuchstaben bestehen "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "Die Beschreibung ist zu lang (max. 140 Zeichen)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "Konnte Gruppe nicht aktualisieren."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 #, fuzzy
 msgid "Options saved."
 msgstr "Einstellungen gespeichert."
@@ -3716,107 +4270,120 @@ msgid "Awaiting confirmation on this address. "
 msgstr "Warte auf die Bestätigung dieser Adresse. "
 
 #: actions/emailsettings.php:139 actions/smssettings.php:150
-#, fuzzy
 msgid "Make a new email address for posting to; "
-msgstr "Neue E-Mailadresse um Nachrichten auf %s hinzuzufügen; "
+msgstr "Neue E-Mail-Adresse um Nachrichten auf %s hinzuzufügen; "
 
 #: actions/emailsettings.php:157
 msgid "Send me email when someone "
 msgstr "Schicke mir eine E-Mail, wenn jemand "
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Erlaube Freunden mich zu stupsen und mir E-Mails zu senden."
 
 #: actions/emailsettings.php:321
-#, fuzzy
 msgid "That email address already belongs "
-msgstr "Diese E-Mailadresse gehört "
+msgstr "Diese E-Mail-Adresse gehört "
 
 #: actions/emailsettings.php:343
 msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
-"Ein Bestätigungscode wurde an die E-Mailadresse geschickt, die du "
-"hinzugefügt hast."
+"Ein Bestätigungscode wurde an die E-Mail-Adresse geschickt, die du "
+"hinzugefügt hast. "
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 #, fuzzy
 msgid "Server error - couldn't get user!"
 msgstr "Serverfehler - Benutzer nicht gefunden!"
 
 #: actions/facebookhome.php:196
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "If you would like the %s app to automatically update "
 msgstr "Wenn du automatische Aktualisierungen der Anwendung %s möchtest "
 
 #: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, php-format
 msgid "Allow %s to update my Facebook status"
-msgstr "Erlaube %s meinen Facebook Status zu aktualisieren"
+msgstr "Erlaube %s meinen Facebook-Status zu aktualisieren"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Ãœberspringen"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "Kein Inhalt!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 #, fuzzy
 msgid "Pagination"
 msgstr "Seitenerstellung"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "Später"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "Vorher"
 
-#: actions/facebookinvite.php:70
-#, php-format
-#, fuzzy
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
+#, fuzzy, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Danke, dass du deine Freunde zu %s einlädst"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 #, fuzzy
 msgid "Invitations have been sent to the following users:"
 msgstr "Einladung(en) an folgende Personen geschickt:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, fuzzy, php-format
 msgid "You have been invited to %s"
 msgstr "Du wurdest von %s angestupst"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "Lade deine Freunde ein %s zu nutzen"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Freunde, die %s bereits benutzen:"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Einladungen versenden"
 
 #: actions/facebookremove.php:56
 msgid "Couldn't remove Facebook user."
-msgstr "Konnte Facebook Benutzer nicht entfernen."
+msgstr "Konnte Facebook-Benutzer nicht entfernen."
 
 #: actions/facebooksettings.php:65
 #, fuzzy
 msgid "There was a problem saving your sync preferences!"
-msgstr "Es gab ein Problem beim Speichern deiner Synchronisationseinstellungen."
+msgstr ""
+"Es gab ein Problem beim Speichern deiner Synchronisationseinstellungen."
 
 #: actions/facebooksettings.php:67
 #, fuzzy
@@ -3824,20 +4391,17 @@ msgid "Sync preferences saved."
 msgstr "Synchronisationseinstellungen gespeichert."
 
 #: actions/facebooksettings.php:90
-#, fuzzy
 msgid "Automatically update my Facebook status with my notices."
 msgstr ""
-"Meinen Facebook Status automatisch über meine Nachrichten aktualisieren."
+"Meinen Facebook-Status automatisch über meine Nachrichten aktualisieren."
 
 #: actions/facebooksettings.php:97
-#, fuzzy
 msgid "Send \"@\" replies to Facebook."
-msgstr "Schicke \"@\" Antworten an Facebook."
+msgstr "Schicke „@“-Antworten an Facebook."
 
 #: actions/facebooksettings.php:106
-#, fuzzy
 msgid "Prefix"
-msgstr "Prefix"
+msgstr "Präfix"
 
 #: actions/facebooksettings.php:108
 #, fuzzy
@@ -3854,13 +4418,15 @@ msgstr "Wenn du %s automatisch aktualisieren lassen möchtest "
 msgid "Sync preferences"
 msgstr "Synchronisationseinstellungen"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 #, fuzzy
 msgid "Disfavor favorite"
 msgstr "Aus Favoriten entfernen"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Beliebte Nachrichten"
 
@@ -3874,33 +4440,34 @@ msgid "The most popular notices on the site right now."
 msgstr "Die momentan beliebtesten Nachrichten auf dieser Seite."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 #, fuzzy
 msgid "Featured users"
 msgstr "Featured Benutzer"
 
 #: actions/featured.php:71
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "Featured users, page %d"
 msgstr "Featured Benutzer, Seite %d"
 
 #: actions/featured.php:99
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "A selection of some of the great users on %s"
 msgstr "Eine Auswahl der tollen Benutzer auf %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 #, fuzzy
 msgid "That user has blocked you from subscribing."
 msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "Keine ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Gruppen-Logo"
 
@@ -3908,12 +4475,14 @@ msgstr "Gruppen-Logo"
 msgid "You can upload a logo image for your group."
 msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "Logo aktualisiert."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "Aktualisierung des Logos fehlgeschlagen."
@@ -3933,7 +4502,8 @@ msgid "A list of the users in this group."
 msgstr "Liste der Benutzer in dieser Gruppe."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -3943,23 +4513,23 @@ msgid "Groups, page %d"
 msgstr "Gruppen, Seite %d"
 
 #: actions/groups.php:90
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "%%%%site.name%%%% Gruppen - finde und tausche dich aus mit "
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "Neue Gruppe erstellen"
 
-# Suche nach "Nutzern" stimmt ja nicht, es ist die Gruppensuche.
 #: actions/groupsearch.php:57
 #, fuzzy, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Suche nach Gruppen auf %%site.name%% nach Name, Ort oder Beschreibung. "
+msgstr ""
+"Suche nach Gruppen auf %%site.name%% nach Name, Ort oder Beschreibung. "
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "Gruppen-Suche"
@@ -3972,7 +4542,7 @@ msgstr "Du kannst Nachrichten senden und empfangen über "
 #: actions/imsettings.php:120
 #, php-format
 msgid "Jabber or GTalk address, "
-msgstr "Jabber oder GTalk Adressen, "
+msgstr "Jabber- oder GTalk-Adressen, "
 
 #: actions/imsettings.php:147
 #, fuzzy
@@ -3984,21 +4554,21 @@ msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
 msgid "A confirmation code was sent "
 msgstr "Es wurde ein Bestätigungscode gesendet "
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Du bist bereits Mitglied dieser Gruppe"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s ist der Gruppe %s beigetreten"
@@ -4008,16 +4578,19 @@ msgstr "%s ist der Gruppe %s beigetreten"
 msgid "Inboxes must be enabled for groups to work."
 msgstr "Damit Gruppen funktionieren müssen Posteingänge aktiviert sein."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "Keine derartige Gruppe."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
@@ -4028,22 +4601,26 @@ msgid "You may not leave a group while you are its administrator."
 msgstr ""
 "Du kannst eine Gruppe nicht verlassen solange du der Administrator bist."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 #, fuzzy
 msgid "Could not find membership record."
 msgstr "Konnte Mitgliedseintrag nicht finden."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s hat die Gruppe %s verlassen"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 #, fuzzy
 msgid "Login to site"
 msgstr "An Seite anmelden"
@@ -4056,17 +4633,19 @@ msgstr "Kein aktueller Status"
 msgid "New group"
 msgstr "Neue Gruppe"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 #, fuzzy
 msgid "Use this form to create a new group."
 msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "Konnte Gruppe nicht erstellen."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
@@ -4080,20 +4659,23 @@ msgstr "Das ist zu lang. "
 msgid "Don't send a message to yourself; "
 msgstr "Schreibe dir selbst keine Nachrichten; "
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 #, fuzzy
 msgid "Notice posted"
 msgstr "Nachricht hinzugefügt"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
-msgstr "Ajax Fehler"
+msgstr "Ajax-Fehler"
 
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"Dieser Benutzer erlaubt keine Stupser oder hat seine E-Mailadresse noch "
+"Dieser Benutzer erlaubt keine Stupser oder hat seine E-Mail-Adresse noch "
 "nicht bestätigt."
 
 #: actions/nudge.php:94
@@ -4104,10 +4686,9 @@ msgstr "Stups abgeschickt"
 msgid "Nudge sent!"
 msgstr "Stups gesendet!"
 
-#: actions/openidlogin.php:97
-#, fuzzy
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
-msgstr "OpenID Anmeldung"
+msgstr "OpenID-Anmeldung"
 
 #: actions/openidsettings.php:128
 #, fuzzy
@@ -4125,36 +4706,39 @@ msgstr "Verwalte zahlreiche andere Einstellungen."
 
 #: actions/othersettings.php:93
 msgid "URL Auto-shortening"
-msgstr "URL Auto-Verkürzung"
+msgstr "URL-Auto-Verkürzung"
 
 #: actions/othersettings.php:112
 msgid "Service"
 msgstr "Dienst"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
-msgstr "URL Auto-Kürzungs Dienst."
+msgstr "URL-Auto-Kürzungs-Dienst."
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL Auto-Kürzungs Dienst ist zu lange (max. 50 Zeichen)"
+msgstr "URL-Auto-Kürzungs-Dienst ist zu lange (max. 50 Zeichen)"
 
 #: actions/passwordsettings.php:69
 #, fuzzy
 msgid "Change your password."
 msgstr "Ändere dein Passwort,"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "Passwort gespeichert"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Ungültiger Tag: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Benutzer die sich selbst mit %s getagged haben - Seite %d"
@@ -4162,14 +4746,15 @@ msgstr "Benutzer die sich selbst mit %s getagged haben - Seite %d"
 #: actions/peopletag.php:91
 #, php-format
 msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Benutzer die sich selbst mit \"%s\" getagged haben "
+msgstr "Benutzer die sich selbst mit „%s“ getagged haben "
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "Profilinformation"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4182,20 +4767,25 @@ msgid "Automatically subscribe to whoever "
 msgstr "Abonniere automatisch alle Kontakte, die mich abonnieren "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "Ungültiger Tag: \"%s\""
+msgstr "Ungültiger Tag: „%s“"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "Konnte Tags nicht speichern."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "Öffentliche Zeitleiste, Seite %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Konnte öffentlichen Stream nicht abrufen."
 
@@ -4218,11 +4808,13 @@ msgstr "Öffentliche Tag-Wolke"
 msgid "These are most popular recent tags on %s "
 msgstr "Das sind die beliebtesten Tags auf %s "
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "Tag-Wolke"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
 
@@ -4232,9 +4824,8 @@ msgid "You can't register if you don't "
 msgstr "Du kannst dich nicht registrieren, wenn du nicht "
 
 #: actions/register.php:286
-#, fuzzy
 msgid "With this form you can create "
-msgstr "Dieses Formular hilft die beim Erstellen von "
+msgstr "Dieses Formular hilft dir beim Erstellen von "
 
 #: actions/register.php:368
 #, fuzzy
@@ -4242,9 +4833,8 @@ msgid "1-64 lowercase letters or numbers, "
 msgstr "1-64 Kleinbuchstaben oder Ziffern, "
 
 #: actions/register.php:382 actions/register.php:386
-#, fuzzy
 msgid "Used only for updates, announcements, "
-msgstr "Verwendet nur für Updates und wichtige Mitteilungen, "
+msgstr "Verwendet nur für Aktualisierungen und wichtige Mitteilungen, "
 
 #: actions/register.php:398
 #, fuzzy
@@ -4281,7 +4871,8 @@ msgstr "(Du solltest eine Nachricht per E-Mail erhalten "
 msgid "That's a local profile! Login to subscribe."
 msgstr "Das ist ein lokales Profil! Zum Abonnieren anmelden."
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "Antworten an %s, Seite %d"
@@ -4291,72 +4882,93 @@ msgstr "Antworten an %s, Seite %d"
 msgid "%s favorite notices, page %d"
 msgstr "%ss favorisierte Nachrichten, Seite %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s Gruppe"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s Gruppe, Seite %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "Gruppenprofil"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "Nachricht"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 #, fuzzy
 msgid "Group actions"
 msgstr "Gruppenaktionen"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "Nachrichtenfeed der Gruppe %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "Mitglieder"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 #, fuzzy
 msgid "(None)"
 msgstr "(Kein)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "Alle Mitglieder"
 
 #: actions/showgroup.php:378
-#, 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 "
 msgstr ""
-"**%s** ist eine Benutzergruppe auf %%site.name%%, einem [mikro-blogging] "
-"(http://de.wikipedia.org/wiki/Mikro-blogging) Dienst "
+"**%s** ist eine Benutzergruppe auf %%%%site.name%%%%, einem [mikro-blogging-"
+"Dienst](http://de.wikipedia.org/wiki/Mikro-blogging) "
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
 msgstr "Nur der Absender und Empfänger "
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, Seite %d"
@@ -4367,46 +4979,53 @@ msgid "'s profile"
 msgstr "s Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "Benutzerprofil"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Foto"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 #, fuzzy
 msgid "User actions"
 msgstr "Benutzeraktionen"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 #, fuzzy
 msgid "Send a direct message to this user"
 msgstr "Direkte Nachricht an Benutzer verschickt"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 #, fuzzy
 msgid "Message"
 msgstr "Nachricht"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "Alle Abonnenten"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "Alle Gruppen"
 
 #: actions/showstream.php:542
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** hat ein Konto auf %%site.name%%, einem [mikro-blogging] "
-"(http://de.wikipedia.org/wiki/Mikro-blogging) Dienst "
+"**%s** hat ein Konto auf %%%%site.name%%%%, einem [mikro-blogging-Dienst]"
+"(http://de.wikipedia.org/wiki/Mikro-blogging) "
 
 #: actions/smssettings.php:128
 #, fuzzy
@@ -4425,7 +5044,7 @@ msgstr ""
 "Ein Bestätigungscode wurde an die Telefonnummer gesendet, die du hinzugefügt "
 "hast. "
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Netzanbieter"
@@ -4455,8 +5074,7 @@ msgid "%s subscribers"
 msgstr "%s Abonnenten"
 
 #: actions/subscribers.php:52
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "%s subscribers, page %d"
 msgstr "%s Abonnenten, Seite %d"
 
@@ -4490,20 +5108,20 @@ msgstr "Dies sind die Leute, deren Nachrichten "
 msgid "These are the people whose "
 msgstr "Dies sind die Leute, deren "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Nachrichten, die mit %s getagt sind, Seite %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
-#, fuzzy
 msgid "Messages tagged \"%s\", most recent first"
-msgstr "Nachrichten getagt mit \"%s\", neueste zuerst"
+msgstr "Nachrichten getagt mit „%s“, neueste zuerst"
 
 #: actions/tagother.php:33
 #, fuzzy
@@ -4525,7 +5143,7 @@ msgstr "Tag %s"
 msgid "Tag user"
 msgstr "Benutzer taggen"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4538,18 +5156,18 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Du kannst nur Benutzer taggen, die du abonniert hast oder die dich abonniert "
 "haben."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Konnte Tags nicht speichern."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -4561,40 +5179,43 @@ msgstr ""
 msgid "No such tag."
 msgstr "Tag nicht vorhanden."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "Microblog getaggt mit %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Blockieren des Benutzers fehlgeschlagen."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 #, fuzzy
 msgid "Unblock user failed."
 msgstr "Freigeben des Benutzers fehlgeschlagen."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Nicht gefunden."
 
 #: actions/twittersettings.php:71
-#, fuzzy
 msgid "Add your Twitter account to automatically send "
-msgstr "Füge dein Twitter Konto hinzu zum automatischen Versenden von "
+msgstr "Füge dein Twitter-Konto hinzu zum automatischen Versenden von "
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
-msgstr "Twitter Benutzername"
+msgstr "Twitter-Benutzername"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
-msgstr "Twitter Passwort"
+msgstr "Twitter-Passwort"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
-msgstr "Twitter Freunde"
+msgstr "Twitter-Freunde"
 
 #: actions/twittersettings.php:327
 #, fuzzy
@@ -4606,169 +5227,178 @@ msgstr "Für den Benutzernamen gelten nur Nummern, "
 msgid "Unable to retrieve account information "
 msgstr "Konnte Kontoinformationen nicht abrufen "
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "Fehler beim Freigeben des Benutzers."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "Der entfernte Server hat keine Profil-ID geliefert."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 #, fuzzy
 msgid "No profile with that id."
 msgstr "Kein Profil mit dieser ID."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "%s Gruppen"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s Gruppen, Seite %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
 "ein paar Minuten ab."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
-msgstr "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
+msgstr ""
+"Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 #, fuzzy
 msgid "Upload an avatar"
 msgstr "Avatar hochladen"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 #, fuzzy
 msgid "Other"
 msgstr "Sonstige"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 #, fuzzy
 msgid "Other options"
 msgstr "Sonstige Optionen"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Seite ohne Titel"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Hauptnavigation"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 #, fuzzy
 msgid "Personal profile and friends timeline"
 msgstr "Persönliches Profil und Freundes-Zeitleiste"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 #, fuzzy
 msgid "Search for people or text"
 msgstr "Suche nach Leuten oder Text"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Konto"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "Ändere deine E-Mail, dein Avatar, Passwort, Profil"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 #, fuzzy
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Verbinde zu IM, SMS, Twitter"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 #, fuzzy
 msgid "Logout from the site"
 msgstr "Von der Seite abmelden"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 #, fuzzy
 msgid "Login to the site"
 msgstr "Auf der Seite anmelden"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Neues Konto erstellen"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "Mit OpenID anmelden"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "Hilf mir!"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "Neue Nachricht"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 #, fuzzy
 msgid "Local views"
 msgstr "Lokale Ansichten"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "Neue Nachricht"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Unternavigation"
 
-#: lib/action.php:602 lib/action.php:623
-#, fuzzy
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
-msgstr "StatusNet Software Lizenz"
+msgstr "StatusNet-Software-Lizenz"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 #, fuzzy
 msgid "All "
 msgstr "Alle "
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 #, fuzzy
 msgid "license."
 msgstr "Lizenz."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "Benutzer blockieren"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Blockieren"
 
@@ -4782,12 +5412,15 @@ msgstr "Aus Favoriten entfernen"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "Um die %s Facebookanwendung zu benutzen, musst du dich anmelden "
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr " ein neues Konto."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 #, fuzzy
 msgid "Published"
 msgstr "Öffentlich"
@@ -4809,36 +5442,41 @@ msgstr "Tags filtern"
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Tag"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 #, fuzzy
 msgid "Choose a tag to narrow list"
 msgstr "Wähle einen Tag, um die Liste einzuschränken"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 #, fuzzy
 msgid "Go"
 msgstr "Los"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
 msgstr "Beschreibung"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4848,25 +5486,23 @@ msgstr "Ort der Gruppe, optional, z.B. \"Stadt, Gebiet (oder Region), Land\""
 msgid "Group"
 msgstr "Gruppe"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 #, fuzzy
 msgid "Admin"
 msgstr "Admin"
 
-#: lib/groupnav.php:101
-#, php-format
-#, fuzzy
+#: lib/groupnav.php:101 lib/groupnav.php:107
+#, fuzzy, php-format
 msgid "Edit %s group properties"
 msgstr "%s Gruppeneinstellungen bearbeiten"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 #, fuzzy
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
-#, php-format
-#, fuzzy
+#: lib/groupnav.php:107 lib/groupnav.php:113
+#, fuzzy, php-format
 msgid "Add or edit %s logo"
 msgstr "%s Logo hinzufügen oder bearbeiten"
 
@@ -4879,8 +5515,7 @@ msgid "Groups with most posts"
 msgstr "Gruppen mit den meisten Beiträgen"
 
 #: lib/grouptagcloudsection.php:56
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "Tags in %s group's notices"
 msgstr "Tags in den Nachrichten der Gruppe %s"
 
@@ -4899,12 +5534,12 @@ msgstr "Beitreten"
 msgid "Leave"
 msgstr "Verlassen"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Anmelden mit einem Benutzernamen und Passwort"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Für ein neues Konto registrieren"
@@ -4914,8 +5549,7 @@ msgid "Login or register with OpenID"
 msgstr "Anmelden oder registrieren mit OpenID"
 
 #: lib/mail.php:175
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
@@ -4928,19 +5562,18 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s liest ab sofort "
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "Standort: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Homepage: %s\n"
 
-#: lib/mail.php:258
-#, php-format
-#, fuzzy
+#: lib/mail.php:258 lib/mail.php:257
+#, fuzzy, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
@@ -4948,7 +5581,7 @@ msgstr ""
 "Biografie: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Du wurdest von %s angestupst"
@@ -4963,47 +5596,55 @@ msgstr "%s$s (%2$s) fragt sich was du so machst "
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s hat deine Nachrichten von %2$s hinzugefügt"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 #, fuzzy
 msgid "From"
 msgstr "Von"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "Versende eine direkte Nachricht"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "Nachricht versenden"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "Verfügbare Zeichen"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 #, fuzzy
 msgid "in reply to"
 msgstr "als Antwort auf"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Auf diese Nachricht antworten"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "Antworten"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Notiz löschen"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete"
 msgstr "Löschen"
@@ -5024,33 +5665,34 @@ msgid "Send a nudge to this user"
 msgstr "Sende diesem Benutzer einen Stupser"
 
 #: lib/personaltagcloudsection.php:56
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "Tags in %s's notices"
 msgstr "Tags in %ss Nachrichten"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 #, fuzzy
 msgid "(none)"
 msgstr "(leer)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Öffentlich"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Benutzer-Gruppen"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Aktuelle Tags"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Featured"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Beliebt"
 
@@ -5067,32 +5709,33 @@ msgstr "Finde Gruppen auf dieser Seite"
 msgid "Untitled section"
 msgstr "Abschnitt ohne Titel"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Leute, die %s abonniert hat"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Leute, die %s abonniert haben"
 
-#: lib/subgroupnav.php:97
-#, php-format
-#, fuzzy
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
+#, fuzzy, php-format
 msgid "Groups %s is a member of"
 msgstr "Gruppen zu denen %s gehört"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Lade Freunde und Kollegen ein dir auf %s beizutreten"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Dieser Benutzer hat dich blockiert."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "Abonniere diesen Benutzer"
@@ -5106,11 +5749,12 @@ msgid "Top posters"
 msgstr "Top-Schreiber"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 #, fuzzy
 msgid "Unblock this user"
 msgstr "Benutzer freigeben"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Freigeben"
 
@@ -5118,48 +5762,2071 @@ msgstr "Freigeben"
 msgid "Unsubscribe from this user"
 msgstr "Lösche dein Abonnement von diesem Benutzer"
 
-#~ msgid "Code not yet ready."
-#~ msgstr "Code noch nicht fertig."
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed der Freunde von %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed der Freunde von %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed der Freunde von %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s und Freunde"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Du kannst dein persönliches Avatar hochladen."
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar aktualisiert."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Du bist gerade dabei eine Nachricht unwiderruflich zu löschen. Diese Aktion "
+"ist irreversibel."
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+"Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+"Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Microblog von %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Durchsuche die Namen, Orten oder Interessen der Nutzer von %%site.name%%. "
+"Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
+"mindestens 3 Zeichen bestehen."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Fehler beim Senden der Nachricht"
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Suche im Stream nach \"%s\""
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Bitte geben Sie aus Sicherheitsgründen ihren Benutzernamen und ihr Passwort "
+"ein, bevor die Änderungen an ihren Einstellungen übernommen werden."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Feed des öffentlichen Streams"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Feed des öffentlichen Streams"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Feed des öffentlichen Streams"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"außer folgende private Daten: Passwort, E-Mail, Adresse, IM Adresse, "
+"Telefonnummer."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Erstellen"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Gruppenprofil"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "s Profil"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Postausgang von %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profil Einstellungen"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Ein Bestätigungscode wurde an die von Ihnen angegebene Telefonnummer "
+"gesandt. Überprüfen Sie bitte Ihren Posteingang (auch den Spamordner!) auf "
+"den Code und die Anweisungen, um ihn zu benutzen."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Kein solcher Benutzer"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Füge dein Twitter-Konto hinzu, um automatisch deine Nachrichten an Twitter "
+"zu übermitteln, "
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr ""
+"Es konnten keine Kontoinformationen zu \"%s\" von Twitter empfangen werden."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"Bitte überprüfe diese Angaben, um sicher zu gehen, dass du die Nachrichten "
+"dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
+"\"Abbrechen\"."
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Suche nach Leuten oder Text"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
+"ein paar Minuten ab."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Verbinde zu IM, SMS, Twitter"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Stups"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "Um die %s Facebookanwendung zu benutzen, musst du dich anmelden "
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s hat deine Nachrichten auf %2$s abonniert.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Gruß,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Suchen"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Unbekanntes Dokument."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Liste der Benutzer in dieser Gruppe."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Liste der Benutzer in dieser Gruppe."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Benutzerprofil"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s und Freunde, Seite %d"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Liste der Benutzer in dieser Gruppe."
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Freigeben des Benutzers fehlgeschlagen."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Bestätigungscode"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Die Nachricht konnte nicht gelöscht werden."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ungültiger Tag: \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Konnte keinen Favoriten erstellen."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Neue Nachricht"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Neue Nachricht"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Ungültiger Nutzername."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Kein Profil angegeben."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Dieser Benutzer hat dich blockiert."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Du bist kein Mitglied dieser Gruppe."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Benutzer blockieren"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Gruppen"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Konnte Twitter Einstellungen nicht speichern!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Synchronisationseinstellungen gespeichert."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Du musst ein Administrator sein, um die Gruppe zu bearbeiten"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Admin"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Keine Ergebnisse"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Dieser Benutzer hat dich blockiert."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Nachricht"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Konnte Profil nicht speichern."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"Mit [OpenID](%%doc.openid%%) kannst du dich bei mehreren Sites mit demselben "
+"Nutzerkonto anmelden. Hier kannst du deine verknüpften OpenIDs verwalten."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profil Einstellungen"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"Dies ist %%site.name%%, ein [mikro-blogging] (http://de.wikipedia.org/wiki/"
+"Mikro-blogging) Dienst "
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Wenn du dein Passwort vergessen oder verloren hast kannst du dir an die E-"
+"Mail Adresse, die in deinem Account eingetragen ist, ein neues zusenden "
+"lassen."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Du wurdest indentifiziert. Bitte trage unten ein neues Passwort ein."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Wiederherstellung des Passworts angefordert"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Fehler beim Bestätigungscode."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Abonniere diesen Benutzer"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%ss favorisierte Nachrichten, Seite %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Nachrichtenfeed der Gruppe %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Nachrichtenfeed der Gruppe %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Nachrichtenfeed der Gruppe %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"**%s** ist eine Benutzergruppe auf %%site.name%%, einem [mikro-blogging] "
+"(http://de.wikipedia.org/wiki/Mikro-blogging) Dienst "
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Admin"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Kein lokaler Benutzer."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Nachrichten, die mit %s getagt sind"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Nachrichtenfeed der Gruppe %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"**%s** hat ein Konto auf %%site.name%%, einem [mikro-blogging] (http://de."
+"wikipedia.org/wiki/Mikro-blogging) Dienst "
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s liest ab sofort "
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Diese Nachricht ist bereits ein Favorit!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Diese Nachricht ist kein Favorit!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Konnte öffentlichen Stream nicht abrufen."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "Kein Empfänger angegeben."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Konnte keine Statusmeldungen finden."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s Antworten an %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Updates von %1$s auf %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "Lizenz."
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s Abonnements"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profil Einstellungen"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Du bist kein Mitglied dieser Gruppe."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problem bei Speichern der Nachricht."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Nachricht an %1$s auf %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Benutzerprofil"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profil"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Hochladen"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Ändere dein Passwort"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Verbinden"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Suchen"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Liste"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Blockieren"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Benutzer blockieren"
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "%s Logo hinzufügen oder bearbeiten"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Kein Inhalt!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Benutzer"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Suchen"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr ""
+"Homepage ist kein gültiger URL. URL´s müssen ein Präfix wie http enthalten."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Tag nicht vorhanden."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Direkte Nachricht an %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Kann Nutzer %s nicht folgen: Nutzer nicht gefunden"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Die Beschreibung ist zu lang (max. 140 Zeichen)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Du bist bereits Mitglied dieser Gruppe"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Du bist kein Mitglied dieser Gruppe."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s Gruppen"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Gruppen zu denen %s gehört"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Gruppenaktionen"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar aktualisiert."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen beschränkt."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Bildformat wird nicht unterstützt."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Foto"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Die Beschreibung ist zu lang (max. 140 Zeichen)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Aktualisierungen von %1$s auf %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Aufgeführte Nutzer existiert nicht."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Nicht autorisiert."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Unbekannte OMB-Protokollversion."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Unbekannte Nachricht."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Daten verloren."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Aktualisierungen von %1$s auf %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Diese Seite liegt in nicht verfügbar in einem "
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Melde dich mit Nutzernamen und Passwort an. Du hast noch keinen Nutzernamen? "
+"[Registriere](%%action.register%%) ein neues Konto oder versuche es mit "
+"[OpenID](%%action.openidlogin%%)."
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Updates von %1$s auf %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Alle Aktualisierungen, die den Suchbegriff „%s“ enthalten"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Verbinden"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Beschreibe dich selbst in 140 Zeichen"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Beschreibe dich selbst und deine "
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Ungültige Profil-URL (kein YADIS-Dokument)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Das ist ein lokales Profil! Zum Abonnieren anmelden."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Konnte keinen Anfrage-Token bekommen."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Nachricht an %1$s auf %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed der Freunde von %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed der Freunde von %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed der Freunde von %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Postausgang von %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Nachricht hinzugefügt"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Diese Seite liegt in nicht verfügbar in einem "
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Bitte überprüfe diese Angaben, um sicher zu gehen, dass du die Nachrichten "
+"dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
+"\"Abbrechen\"."
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"Das Abonnement wurde bestätigt, aber es wurde keine Callback-URL "
+"zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
+"bestätigt werden. Dein Abonnement-Token ist:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Das Abonnement wurde abgelehnt, aber es wurde keine Callback-URL "
+"zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
+"vollständig abgelehnt werden. Dein Abonnement-Token ist:"
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
 
-#~ msgid "Export and delete your user information."
-#~ msgstr "Exportiere und lösche deine Benutzer Daten."
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Konnte Avatar-URL nicht öffnen „%s“"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Falscher Bildtyp für „%s“"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Konnte nicht zum Server umleiten: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet-Software-Lizenz"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Stups abgeschickt"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet"
 
-#~ msgid "Delete my account"
-#~ msgstr "Lösche meinen Account"
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Auf diese Nachricht antworten"
 
+#: lib/command.php:441
 #, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Konnte E-Mailbestätigung nicht löschen."
+msgid "Error saving notice."
+msgstr "Problem bei Speichern der Nachricht."
 
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
+msgid "No configuration file found. "
+msgstr "Kein Bestätigungs-Code."
 
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Kürzlich populäre Nachrichten"
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
 
-#~ msgid "Tag a person"
-#~ msgstr "Tagge eine Person"
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
 
+#: lib/common.php:194
 #, fuzzy
-#~ msgid "List"
-#~ msgstr "Liste"
+msgid "Go to the installer."
+msgstr "Auf der Seite anmelden"
 
-#~ msgid "Icons"
-#~ msgstr "Icons"
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Wähle einen Netzanbieter"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "E-Mail konnte nicht bestätigt werden."
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen"
 
-#~ msgid "Email address"
-#~ msgstr "E-Mail Adresse "
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Fehler beim Einfügen der Nachricht"
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Neue Nachricht"
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "Wenn du deine Passwort verlegt hast, kannst du dir ein Neues an die E-"
-#~ "Mailadresse schicken lasssen, die für dein Konto eingetragen ist."
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s hat deine Nachricht als Favorit gespeichert"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "von"
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Konnte öffentlichen Stream nicht abrufen."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Notiz löschen"
diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo
index 184639963..cd2deb789 100644
--- a/locale/el/LC_MESSAGES/statusnet.mo
+++ b/locale/el/LC_MESSAGES/statusnet.mo
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 4a54996a8..0cd27cf8d 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -1,30 +1,29 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Greek
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-09-08 20:21+0000\n"
-"Last-Translator: Giannis Pappas <papasj@mailinator.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:14+0000\n"
+"Language-Team: Greek\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: el\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Αναζήτηση �οής για \"%s\""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -37,17 +36,19 @@ msgid " from "
 msgstr "από"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -79,6 +80,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
@@ -95,25 +97,28 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "Δημόσια �οή %s"
@@ -123,35 +128,48 @@ msgstr "Δημόσια �οή %s"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s και οι φίλοι του/της"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "Κατάσταση του/της %s"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-#, fuzzy
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, fuzzy, php-format
 msgid "%s timeline"
 msgstr "Χ�ονοδιάγ�αμμα του χ�ήστη %s"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -159,9 +177,9 @@ msgstr ""
 "(Σ�ντομα θα λάβετε μέσω ηλεκτ�ονικο� ταχυδ�ομείου ένα μήνυμα με οδηγίες για "
 "την επιβεβαίωση της ηλεκτ�ονικής σας διε�θυνσης.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
-#, php-format
-#, fuzzy
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
+#, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
@@ -169,9 +187,9 @@ msgstr ""
 "To **%%site.name%%** είναι μία υπη�εσία microblogging (μικ�ο-ιστολογίου) που "
 "έφε�ε κοντά σας το  [%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-#, fuzzy
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
+#, fuzzy, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 "Το **%%site.name%%** είναι μία υπη�εσία microblogging (μικ�ο-ιστολογίου). "
@@ -183,30 +201,34 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 μικ�ά γ�άμματα ή α�ιθμοί, χω�ίς σημεία στίξης ή κενά"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1-64 μικ�ά γ�άμματα ή α�ιθμοί, χω�ίς σημεία στίξης ή κενά. Απα�αίτητο."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 ή πε�ισσότε�οι χα�ακτή�ες"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 ή πε�ισσότε�οι χα�ακτή�ες και μην το ξεχάσετε!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 ή πε�ισσότε�οι χα�ακτή�ες. Απα�αίτητο."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -216,6 +238,7 @@ msgstr ""
 "Π�έπει να αποδεχτείτε τον/την %s για αποστολή μηνυμάτων π�ος εσας. "
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -251,7 +274,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Η μέθοδος του ΑΡΙ δε β�έθηκε!"
 
@@ -274,16 +324,23 @@ msgstr "Η μέθοδος του ΑΡΙ δε β�έθηκε!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "Η μέθοδος του ΑΡΙ είναι υπό κατασκευή."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Πε�ί"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Αποδοχή"
 
@@ -294,6 +351,9 @@ msgstr "Αποδοχή"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Π�οσθήκη"
 
@@ -311,27 +371,29 @@ msgstr "Π�οσθήκη ή διαγ�αφή OpenIDs"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Διε�θυνση"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Διευθ�νσεις φίλων σου που θες να π�οσκαλέσεις (μία ανά γ�αμμή)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Όλες οι συνδ�ομές"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Όλες οι ενημε�ώσεις για %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Όλες οι ενημε�ώσεις που ται�ιάζουν με τον ό�ο αναζήτησης \"%s\""
@@ -341,30 +403,37 @@ msgstr "Όλες οι ενημε�ώσεις που ται�ιάζουν με τ
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Ήδη συνδεδεμένος."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Είσαι ήδη συνδ�ομητής!."
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Είσαι σίγου�ος ότι θες να διαγ�άψεις αυτό το μήνυμα;"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Εξουσιοδοτημένη συνδ�ομή"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Αυτόματη σ�νδεση στο μέλλον. ΟΧΙ για κοινόχ�ηστους υπολογιστές!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
@@ -375,17 +444,20 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr ""
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr ""
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
-#, php-format
-#, fuzzy
+#: actions/imsettings.php:108 actions/imsettings.php:114
+#, fuzzy, 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?)"
@@ -395,6 +467,7 @@ msgstr ""
 "λίστα φίλων?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 #, fuzzy
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
@@ -404,7 +477,7 @@ msgstr ""
 "φάκελο spam!) για μήνυμα με πε�αιτέ�ω οδηγίες. "
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νο�με�ο τηλεφώνου."
 
@@ -416,6 +489,8 @@ msgstr "Π�οηγο�μενο »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Βιογ�αφικό"
 
@@ -423,17 +498,19 @@ msgstr "Βιογ�αφικό"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Το βιογ�αφικό είναι πολ� μεγάλο (μέγιστο 140 χα�ακτ.)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 #, fuzzy
 msgid "Can't delete this notice."
 msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr ""
@@ -441,6 +518,8 @@ msgstr ""
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Αδ�νατη η αποθήκευση του νέου κωδικο�"
 
@@ -448,31 +527,34 @@ msgstr "Αδ�νατη η αποθήκευση του νέου κωδικο�"
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Ακ��ωση"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Απέτυχη η χ�ήση αντικειμένου OpenID consumer."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Αδυναμία κανονικοποίησης του Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Αδυναμία κανονικοποίησης αυτής της email διε�θυνσης"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Αλλαγή"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr ""
 
@@ -482,11 +564,12 @@ msgid "Change password"
 msgstr "Αλλαγή κωδικο�"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Αλλάξτε τον κωδικό σας"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Αλλάξτε τις �υθμίσεις του π�οφίλ σας"
 
@@ -496,6 +579,9 @@ msgstr "Αλλάξτε τις �υθμίσεις του π�οφίλ σας"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Επιβεβαίωση"
 
@@ -508,12 +594,14 @@ msgstr "Επιβεβαίωση διε�θυνσης"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Η επιβεβαίωση ακυ�ώθηκε."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr ""
 
@@ -522,9 +610,9 @@ msgstr ""
 msgid "Confirmation code not found."
 msgstr "Ο κωδικός επιβεβαίωσης δεν β�έθηκε."
 
-#: ../actions/register.php:202
-#, php-format
-#, fuzzy
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
+#, fuzzy, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to...\n"
@@ -549,9 +637,8 @@ msgstr ""
 "δέχεσε μην�ματα στο instant messager σου.\n"
 "* [Search for people](%%%%action.peoplesearch%%%%) που μπο�εί να ξέ�εις ή "
 "που έχουν τα ίδια ενδιαφέ�οντα με σένα. \n"
-"* Ενημε�ώσεις το π�οφίλ σου [profile "
-"settings](%%%%action.profilesettings%%%%) για να μάθουν οι άλλοι πε�ισσότε�α "
-"για σένα. \n"
+"* Ενημε�ώσεις το π�οφίλ σου [profile settings](%%%%action.profilesettings%%%"
+"%) για να μάθουν οι άλλοι πε�ισσότε�α για σένα. \n"
 "* Διαβάσεις τα [online docs](%%%%doc.help%%%%) για λειτου�γίες που μπο�εί να "
 "μην έχεις μάθει ακόμα. \n"
 "\n"
@@ -559,20 +646,24 @@ msgstr ""
 "μας."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Σ�νδεση"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Σ�νδεση με υπά�χων λογα�ιασμό"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Επικοινωνία"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Αδυναμία δημιου�γίας φό�μας OpenID: %s "
@@ -580,35 +671,40 @@ msgstr "Αδυναμία δημιου�γίας φό�μας OpenID: %s "
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr "Δε μπο�ώ να ακολουθήσω το χ�ήστη: ο χ�ήστης %s είναι ήδη στη λίστα σου."
+msgstr ""
+"Δε μπο�ώ να ακολουθήσω το χ�ήστη: ο χ�ήστης %s είναι ήδη στη λίστα σου."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Δε μπο�ώ να ακολουθήσω το χ�ήστη: ο χ�ήστης δε β�έθηκε."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Αδυναμία ανακατε�θηνσης στο διακομιστή: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Δε μπό�εσα να σώσω την πλη�οφο�ία του avatar"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Δεν επιτ�έπεται να κάνεις συνδ�ομητές του λογα�ιασμο� σου άλλους."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Απέτυχε η συνδ�ομή."
 
@@ -628,15 +724,17 @@ msgstr "Απέτυχε η μετατ�οπή αιτο�μενων tokens σε to
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Απέτυχε η διαγ�αφή email επιβεβαίωσης."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Απέτυχε η διαγ�αφή συνδ�ομής."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Απέτυχε η ε��εση οποιασδήποτε κατάστασης."
 
@@ -649,29 +747,38 @@ msgstr ""
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Απέτυχε η εισαγωγή κωδικο� επιβεβαίωσης."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Απέτυχε η εισαγωγή νέας συνδ�ομής."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Απέτυχε η αποθήκευση του π�οφίλ."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη για την αυτόματη συνδ�ομή."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Απέτυχε η ενημέ�ωση εγγ�αφής του χ�ήστη."
 
@@ -687,43 +794,49 @@ msgstr "Απέτυχε η ενημέÏ�ωση εγγÏ�αφής του χÏ�ήστÎ
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Δημιου�γία"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Δημιου�γία νέου χ�ήστη με αυτό το ψευδώνυμο."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Δημιου�γία νέου λογα�ιασμο�"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 #, fuzzy
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Μετατ�οπή υπά�χοντος λογα�ιασμο� σε λογα�ιασμό OpenID."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Τ�έχουσα επιβεβαιωμένη Jabber/GTalk διε�θυνση."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Τ�έχων επιβεβαιωμένο, μέσω SMS, νο�με�ο κινητο� τηλεφώνου."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Τ�έχουσα επιβεβαιωμένη email διε�θυνση."
 
@@ -732,23 +845,27 @@ msgid "Currently"
 msgstr ""
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Διαγ�αφή μην�ματος"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Πε�ιέγ�αψε τον εαυτό σου και τα ενδιαφέ�οντά σου σε 140 χα�ακτή�ες"
 
@@ -756,11 +873,13 @@ msgstr "Πε�ιέγ�αψε τον εαυτό σου και τα ενδιαφέ
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Email"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Διε�θυνση Email"
 
@@ -770,39 +889,43 @@ msgid "Email Settings"
 msgstr "Ρυθμίσεις Email"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Η διε�θυνση email υπά�χει ήδη."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Επιβεβαίωση διε�θυνσης email"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Διε�θυνση email, π.χ: \"UserName@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Διευθ�νσεις email"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Εισάγετε ψευδώνυμο ή διε�θυνση email."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr ""
 
@@ -813,39 +936,46 @@ msgstr ""
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr ""
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr ""
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr ""
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr ""
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr ""
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr ""
 
@@ -854,6 +984,9 @@ msgstr ""
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr ""
 
@@ -864,6 +997,7 @@ msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr ""
 
@@ -873,33 +1007,36 @@ msgid "Error with confirmation code."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "Συχνές ε�ωτήσεις"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr ""
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Ροή φίλων του/της %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Ροή απαντήσεων π�ος τον/την %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
@@ -914,7 +1051,7 @@ msgstr ""
 msgid "Find people on this site"
 msgstr ""
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -927,6 +1064,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Ονοματεπώνυμο"
 
@@ -935,23 +1077,33 @@ msgstr "Ονοματεπώνυμο"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Το ονοματεπώνυμο είναι πολ� μεγάλο (μέγιστο 255 χα�ακτ.)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Βοήθεια"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Α�χή"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Α�χική σελίδα"
 
@@ -959,21 +1111,27 @@ msgstr "Α�χική σελίδα"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Θέλω να δημοσιε�ω ενημε�ώσεις μέσω email"
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "ΙΜ"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Διε�θυνση ΙΜ"
 
@@ -983,7 +1141,7 @@ msgid "IM Settings"
 msgstr "Ρυθμίσεις ΙΜ"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -991,7 +1149,7 @@ msgstr ""
 "Εάν έχετε ήδη λογα�ιασμό, συνδεθείτε με το όνομα χ�ήστη και τον κωδικό για "
 "να τον συνδέσετε στο OpenID σας."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -999,7 +1157,7 @@ msgstr ""
 "Εάν θέλετε να π�οσθέσετε ένα OpenID στον λογα�ιασμό σας, πληκτ�ολογήστε τον "
 "από κάτω και πατήστε \"Π�οσθήκη\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1010,25 +1168,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Εισε�χόμενο email"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Η διε�θυνση του εισε�χόμενου email αφαι�έθηκε."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Λάθος παλιός κωδικός"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Λάθος όνομα χ�ήστη ή κωδικός"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1037,30 +1201,31 @@ msgstr ""
 "που έχετε καταχω�ίσει στον λογα�ιασμό σας."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr ""
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr ""
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr ""
 
@@ -1075,13 +1240,13 @@ msgid "Invalid notice url"
 msgstr ""
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
@@ -1099,28 +1264,35 @@ msgstr ""
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr ""
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr ""
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1129,11 +1301,12 @@ msgid ""
 msgstr ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1141,12 +1314,14 @@ msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr ""
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
@@ -1155,7 +1330,15 @@ msgstr ""
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Τοποθεσία"
 
@@ -1164,7 +1347,12 @@ msgstr "Τοποθεσία"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Η τοποθεσία είναι πολ� μεγάλη (μέγιστο 255 χα�ακτ.)."
 
@@ -1173,18 +1361,22 @@ msgstr "Η τοποθεσία είναι πολ� μεγάλη (μέγιστο 2
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Σ�νδεση"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Συνδεθείτε με έναν λογα�ιασμό [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1195,22 +1387,26 @@ msgstr ""
 "ακόμα; Κάντε [εγγ�αφή](%%action.register%%) για ένα νέο λογα�ιασμό ή "
 "δοκιμάστε το [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Αποσ�νδεση"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -1221,16 +1417,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Μέλος από"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr ""
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1240,42 +1438,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr ""
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "�έο ψευδώνυμο"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr ""
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "�έος κωδικός"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
@@ -1285,7 +1491,13 @@ msgstr ""
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
@@ -1294,7 +1506,12 @@ msgstr "Ψευδώνυμο"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Το ψευδώνυμο είναι ήδη σε χ�ήση. Δοκιμάστε κάποιο άλλο."
 
@@ -1303,47 +1520,58 @@ msgstr "Το ψευδώνυμο είναι ήδη σε χÏ�ήση. ΔοκιμάÏ
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Το ψευδώνυμο π�έπει να έχει μόνο πεζο�ς χα�ακτή�ες και χω�ίς κενά."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Το ψευδώνυμο αυτό δεν επιτ�έπεται."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Το ψευδώνυμο του χ�ήστη που θέλετε να πα�ακολουθήσετε"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Ψευδώνυμο ή email"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr ""
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr ""
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr ""
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr ""
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr ""
 
@@ -1355,11 +1583,15 @@ msgstr ""
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr ""
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr ""
 
@@ -1368,7 +1600,9 @@ msgid "No id."
 msgstr ""
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr ""
 
@@ -1379,6 +1613,7 @@ msgstr ""
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr ""
 
@@ -1386,12 +1621,14 @@ msgstr ""
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr ""
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr ""
 
@@ -1401,7 +1638,8 @@ msgid "No profile URL returned by server."
 msgstr ""
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr ""
 
@@ -1413,7 +1651,7 @@ msgstr ""
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr ""
 
@@ -1424,12 +1662,16 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1439,13 +1681,15 @@ msgid "No such OpenID."
 msgstr ""
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr ""
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr ""
 
@@ -1483,12 +1727,22 @@ msgstr ""
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr ""
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr ""
 
@@ -1502,32 +1756,38 @@ msgid "Not a recovery code."
 msgstr ""
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr ""
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr ""
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr ""
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr ""
 
@@ -1535,6 +1795,11 @@ msgstr ""
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1554,7 +1819,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr ""
 
@@ -1565,11 +1831,13 @@ msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr ""
 
@@ -1585,11 +1853,15 @@ msgstr ""
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr ""
 
@@ -1606,39 +1878,44 @@ msgid "Notice feed for %s"
 msgstr ""
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr ""
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr ""
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr ""
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr ""
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr ""
 
@@ -1646,29 +1923,34 @@ msgstr ""
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr ""
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr ""
@@ -1684,11 +1966,12 @@ msgid "OpenID settings"
 msgstr "Ρυθμίσεις OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr ""
 
@@ -1698,34 +1981,46 @@ msgstr ""
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Κωδικός"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Ο κωδικός π�έπει να είναι 6 χα�ακτή�ες ή πε�ισσότε�οι."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Ο κωδικός αποθηκε�τηκε."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Οι κωδικοί δεν ταυτίζονται."
 
@@ -1745,14 +2040,17 @@ msgid "People search"
 msgstr ""
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Π�οσωπικά"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr ""
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
@@ -1764,7 +2062,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
@@ -1773,7 +2071,9 @@ msgstr ""
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Π�οτιμήσεις"
 
@@ -1782,42 +2082,52 @@ msgstr "Π�οτιμήσεις"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Οι π�οτιμήσεις αποθηκε�τηκαν"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr ""
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr ""
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr ""
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr ""
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr ""
 
@@ -1826,17 +2136,19 @@ msgid "Public Stream Feed"
 msgstr ""
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr ""
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1846,12 +2158,14 @@ msgid "Recent Tags"
 msgstr ""
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr ""
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr ""
 
@@ -1864,37 +2178,45 @@ msgstr ""
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr ""
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr ""
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr ""
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr ""
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr ""
 
@@ -1908,6 +2230,9 @@ msgstr ""
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr ""
 
@@ -1916,41 +2241,48 @@ msgstr ""
 msgid "Remove OpenID"
 msgstr ""
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr ""
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr ""
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr ""
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr ""
 
@@ -1959,17 +2291,18 @@ msgstr ""
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr ""
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -1982,12 +2315,21 @@ msgstr ""
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr ""
 
@@ -1997,14 +2339,14 @@ msgid "Search Stream Feed"
 msgstr ""
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 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 ""
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2012,48 +2354,56 @@ msgid ""
 msgstr ""
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr ""
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr ""
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr ""
 
@@ -2073,27 +2423,32 @@ msgid "Something weird happened."
 msgstr ""
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr ""
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr ""
 
@@ -2101,24 +2456,28 @@ msgstr ""
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr ""
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr ""
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr ""
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr ""
 
@@ -2126,28 +2485,35 @@ msgstr ""
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr ""
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr ""
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr ""
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr ""
 
@@ -2167,6 +2533,7 @@ msgid "That confirmation code is not for you!"
 msgstr ""
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr ""
 
@@ -2176,63 +2543,73 @@ msgid "That file is too big."
 msgstr ""
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr ""
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
@@ -2241,18 +2618,22 @@ msgstr ""
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr ""
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2260,40 +2641,45 @@ msgid ""
 msgstr ""
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr ""
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2305,6 +2691,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
@@ -2313,25 +2702,37 @@ msgstr ""
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2340,18 +2741,21 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
@@ -2363,15 +2767,22 @@ msgstr ""
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr ""
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr ""
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr ""
 
@@ -2400,38 +2811,47 @@ msgstr ""
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr ""
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr ""
 
@@ -2448,12 +2868,15 @@ msgid "Upload a new profile image"
 msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
@@ -2477,11 +2900,16 @@ msgstr ""
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr ""
 
@@ -2490,29 +2918,33 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
@@ -2520,7 +2952,9 @@ msgstr ""
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr ""
 
@@ -2541,11 +2975,12 @@ msgid "You are already logged in!"
 msgstr ""
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2563,20 +2998,22 @@ msgstr ""
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2585,21 +3022,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2613,82 +3052,96 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr ""
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr ""
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr ""
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr ""
 
@@ -2710,12 +3163,14 @@ msgid "reply"
 msgstr ""
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr ""
 
@@ -2736,6 +3191,26 @@ msgstr ""
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2744,6 +3219,7 @@ msgid "This notice is not a favorite!"
 msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -2751,22 +3227,28 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2776,11 +3258,13 @@ msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2820,33 +3304,44 @@ msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr ""
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr ""
 
@@ -2900,6 +3395,11 @@ msgstr ""
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr ""
 
@@ -2928,6 +3428,8 @@ msgid "New password successfully saved. "
 msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2948,12 +3450,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2961,7 +3466,7 @@ msgstr ""
 msgid "No such message."
 msgstr ""
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
@@ -2985,51 +3490,70 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
@@ -3048,14 +3572,17 @@ msgid ""
 msgstr ""
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr ""
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr ""
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -3064,6 +3591,7 @@ msgid "Twitter Username"
 msgstr ""
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr ""
 
@@ -3072,24 +3600,29 @@ msgid "Twitter Password"
 msgstr ""
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -3100,33 +3633,43 @@ msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -3143,18 +3686,19 @@ msgid "The subscription has been rejected, but no "
 msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3164,89 +3708,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3254,11 +3820,11 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3273,7 +3839,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -3285,7 +3851,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3294,31 +3860,39 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr ""
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr ""
 
@@ -3331,14 +3905,19 @@ msgid "Twitter integration options"
 msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s και οι φίλοι του/της"
@@ -3348,22 +3927,32 @@ msgid "You can upload your personal avatar."
 msgstr ""
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "Ρυθμίσεις OpenID"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
@@ -3380,35 +3969,44 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr ""
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr ""
 
@@ -3416,11 +4014,11 @@ msgstr ""
 msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr ""
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3437,40 +4035,58 @@ msgstr ""
 msgid "Add to favorites"
 msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "�έο ψευδώνυμο"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3480,16 +4096,17 @@ msgid "Nickname must have only lowercase letters "
 msgstr "Το ψευδώνυμο π�έπει να έχει μόνο πεζο�ς χα�ακτή�ες και χω�ίς κενά."
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "Το βιογ�αφικό είναι πολ� μεγάλο (μέγιστο 140 χα�ακτ.)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr ""
 
@@ -3506,7 +4123,8 @@ msgstr ""
 msgid "Send me email when someone "
 msgstr ""
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3519,7 +4137,7 @@ msgstr "Η διε�θυνση email υπά�χει ήδη."
 msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3533,51 +4151,66 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr ""
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr ""
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr ""
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "Ροή φίλων του/της %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3621,12 +4254,14 @@ msgstr ""
 msgid "Sync preferences"
 msgstr "Π�οτιμήσεις"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr ""
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr ""
 
@@ -3640,7 +4275,8 @@ msgid "The most popular notices on the site right now."
 msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3654,15 +4290,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr ""
 
@@ -3670,12 +4308,14 @@ msgstr ""
 msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "Αποσ�νδεση"
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr ""
 
@@ -3694,7 +4334,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
@@ -3709,6 +4350,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "Δημιου�γία νέου λογα�ιασμο�"
@@ -3719,7 +4361,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr ""
 
@@ -3741,20 +4383,20 @@ msgstr ""
 msgid "A confirmation code was sent "
 msgstr "Ο κωδικός επιβεβαίωσης δεν β�έθηκε."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr ""
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr ""
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr ""
@@ -3763,16 +4405,19 @@ msgstr ""
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr ""
 
@@ -3780,21 +4425,25 @@ msgstr ""
 msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr ""
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr ""
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -3806,16 +4455,18 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
@@ -3828,11 +4479,14 @@ msgstr ""
 msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr ""
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr ""
 
@@ -3849,7 +4503,7 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "Ρυθμίσεις OpenID"
@@ -3875,11 +4529,13 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Η τοποθεσία είναι πολ� μεγάλη (μέγιστο 255 χα�ακτ.)."
@@ -3889,17 +4545,18 @@ msgstr "Η τοποθεσία είναι πολ� μεγάλη (μέγιστο 2
 msgid "Change your password."
 msgstr "Αλλαγή κωδικο�"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "Ο κωδικός αποθηκε�τηκε."
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr ""
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -3909,11 +4566,12 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr ""
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -3923,21 +4581,26 @@ msgid "Automatically subscribe to whoever "
 msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr ""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
@@ -3957,11 +4620,13 @@ msgstr ""
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4010,7 +4675,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr ""
@@ -4020,52 +4686,73 @@ msgstr ""
 msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr ""
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "Μέλος από"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr ""
 
@@ -4080,7 +4767,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4091,31 +4778,38 @@ msgid "'s profile"
 msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr ""
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr ""
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr ""
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr ""
 
@@ -4138,7 +4832,7 @@ msgstr ""
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr ""
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr ""
 
@@ -4197,16 +4891,17 @@ msgstr ""
 msgid "These are the people whose "
 msgstr ""
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr ""
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr ""
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4228,7 +4923,7 @@ msgstr ""
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4238,17 +4933,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4256,20 +4951,23 @@ msgstr ""
 msgid "No such tag."
 msgstr ""
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr ""
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr ""
 
@@ -4277,15 +4975,16 @@ msgstr ""
 msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Όνομα χ�ήστη στο Twitter"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Κωδικός στο Twitter"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Φίλοι στο Twitter"
 
@@ -4298,146 +4997,155 @@ msgstr "Το όνομα χÏ�ήστη Ï€Ï�έπει να έχει μόνο νοÏ�Î
 msgid "Unable to retrieve account information "
 msgstr ""
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr ""
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr ""
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr ""
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr ""
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr ""
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr ""
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr ""
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Account"
 msgstr "Πε�ί"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "Δημιου�γία νέου λογα�ιασμο�"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr ""
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "Βοήθεια"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr ""
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr ""
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr ""
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr ""
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr ""
 
@@ -4450,12 +5158,15 @@ msgstr ""
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "Δημιου�γία νέου λογα�ιασμο�"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr ""
 
@@ -4475,31 +5186,36 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Πε�ιγ�αφή"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Πε�ιγ�άψτε την ομάδα ή το θέμα μέχ�ι 140 χα�ακτή�ες"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Τοποθεσία της ομάδας (εάν υπά�χει), πχ: \"Πόλη, Πε�ιοχή, Χώ�α)"
@@ -4508,20 +5224,20 @@ msgstr "Τοποθεσία της ομάδας (εάν υπά�χει), πχ: \"
 msgid "Group"
 msgstr "Ομάδα"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "Διαχει�ιστής"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Επεξε�γασία ιδιοτήτων της ομάδας %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Λογότυπο"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Π�οσθήκη ή επεξε�γασία λογότυπου για την ομάδα %s"
@@ -4553,11 +5269,11 @@ msgstr "Συμμετοχή"
 msgid "Leave"
 msgstr "Αποχώ�ηση"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Σ�νδεση με όνομα χ�ήστη και κωδικό"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Δημιου�γία νέου λογα�ιασμο�"
@@ -4580,17 +5296,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr ""
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "Τοποθεσία: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Α�χική σελίδα: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4599,7 +5315,7 @@ msgstr ""
 "Βιογ�αφικό: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
@@ -4614,40 +5330,48 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "Από"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 ή πε�ισσότε�οι χα�ακτή�ες"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr ""
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr ""
 
@@ -4668,28 +5392,30 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 #, fuzzy
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Δημόσια"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Ομάδες χ�ηστών"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Π�όσφατες ετικέτες "
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Π�οτεινόμενα"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Δημοφιλή"
 
@@ -4705,31 +5431,33 @@ msgstr "Β�ες ομάδες στο site"
 msgid "Untitled section"
 msgstr "Ενότητα χω�ίς τίτλο"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Π�οσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr ""
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Γίνε συνδ�ομητής αυτο� του χ�ήστη"
 
@@ -4742,10 +5470,11 @@ msgid "Top posters"
 msgstr "Κο�υφαίοι δημοσιευτές"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr ""
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr ""
 
@@ -4753,6 +5482,1967 @@ msgstr ""
 msgid "Unsubscribe from this user"
 msgstr ""
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s και οι φίλοι του/της"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, php-format
+msgid "Microblog by %s group"
+msgstr ""
+
+#: actions/groupsearch.php:57 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 ""
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Αναζήτηση �οής για \"%s\""
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Για λόγους ασφαλείας, πα�ακαλώ εισάγετε ξανά το όνομα χ�ήστη και τον κωδικό "
+"σας, π�ιν αλλάξετε τις �υθμίσεις σας."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr ""
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr ""
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Δημόσια �οή %s"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"εκτός από τα εξής π�οσωπικά δεδομένα: κωδικός π�όσβασης, διε�θυνση email, "
+"διε�θυνση IM, τηλεφωνικό νο�με�ο."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Δημιου�γία"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr ""
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+msgid "Edit Avatar"
+msgstr ""
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Αλλάξτε τις �υθμίσεις του π�οφίλ σας"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στο τηλεφωνικό νο�με�ο που "
+"π�οσθέσατε. Ελέγξτε τα εισε�χόμενα (και τον φάκελο ανεπιθ�μητης "
+"αλληλογ�αφίας) για τον κωδικό και για το πως να τον χ�ησιμοποιήσετε."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr ""
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+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/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"Εάν έχετε ήδη λογα�ιασμό, συνδεθείτε με το όνομα χ�ήστη και τον κωδικό για "
+"να τον συνδέσετε στο OpenID σας."
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, 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 ""
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+msgid "Search site"
+msgstr ""
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr ""
+
+#: actions/block.php:149
+msgid "Do not block this user from this group"
+msgstr ""
+
+#: actions/block.php:150
+msgid "Block this user from this group"
+msgstr ""
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s και οι φίλοι του/της"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr ""
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Τοποθεσία"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Το ψευδώνυμο είναι ήδη σε χ�ήση. Δοκιμάστε κάποιο άλλο."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Μήνυμα"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Μήνυμα"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+msgid "Not a valid invitation code."
+msgstr ""
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr ""
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr ""
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr ""
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Οι π�οτιμήσεις αποθηκε�τηκαν"
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Διαχει�ιστής"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr ""
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr ""
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+msgid "Message sent"
+msgstr ""
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Απέτυχε η αποθήκευση του π�οφίλ."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+msgid "View profile designs"
+msgstr ""
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Εάν έχετε ξεχάσει ή χάσει τον κωδικό σας, μπο�εί να σας αποσταλλεί "
+"καινο��ιος στην διε�θυνση email που έχετε καταχω�ήσει στον λογα�ιασμό σας."
+
+#: actions/recoverpassword.php:158
+msgid "You've been identified. Enter a new password below. "
+msgstr ""
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Ο κωδικός αποθηκε�τηκε."
+
+#: actions/register.php:86
+msgid "Sorry, invalid invitation code."
+msgstr ""
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Γίνε συνδ�ομητής αυτο� του χ�ήστη"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s και οι φίλοι του/της"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr ""
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr ""
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Διαχει�ιστής"
+
+#: actions/shownotice.php:101
+msgid "Not a local notice"
+msgstr ""
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:121
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr ""
+
+#: actions/tag.php:77 actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:91 actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Απέτυχε η ε��εση οποιασδήποτε κατάστασης."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr ""
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr ""
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr ""
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr ""
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+msgid "Problem saving notice. Too long."
+msgstr ""
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr ""
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Αλλάξτε τον κωδικό σας"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Σ�νδεση"
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Σ�νδεση"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Blocked"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "%s blocked users"
+msgstr ""
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Π�οσθήκη ή επεξε�γασία λογότυπου για την ομάδα %s"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+msgid "in context"
+msgstr ""
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+msgid "Search help"
+msgstr ""
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Δε μπο�ώ να ακολουθήσω το χ�ήστη: ο χ�ήστης δε β�έθηκε."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Το βιογ�αφικό είναι πολ� μεγάλο (μέγιστο 140 χα�ακτ.)."
+
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr ""
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr ""
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Ομάδες χ�ηστών"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Ομάδες με τα πε�ισσότε�α μέλη"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Β�ες ομάδες στο site"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr ""
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Το βιογ�αφικό είναι πολ� μεγάλο (μέγιστο 140 χα�ακτ.)."
+
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Απέτυχε η μετατ�οπή αιτο�μενων tokens σε tokens π�όσβασης."
+
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr ""
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/grouprss.php:133
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr ""
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Συνδεθείτε με το όνομα χ�ήστη και τον κωδικό σας. Δεν έχετε όνομα χ�ήστη "
+"ακόμα; Κάντε [εγγ�αφή](%%action.register%%) για ένα νέο λογα�ιασμό ή "
+"δοκιμάστε το [OpenID](%%action.openidlogin%%). "
+
+#: actions/noticesearchrss.php:89
+#, php-format
+msgid "Updates with \"%s\""
+msgstr ""
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Όλες οι ενημε�ώσεις που ται�ιάζουν με τον ό�ο αναζήτησης \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Σ�νδεση"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Πε�ιέγ�αψε τον εαυτό σου και τα ενδιαφέ�οντά σου σε 140 χα�ακτή�ες"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Πε�ιέγ�αψε τον εαυτό σου και τα ενδιαφέ�οντά σου σε 140 χα�ακτή�ες"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Το βιογ�αφικό είναι πολ� μεγάλο (μέγιστο 140 χα�ακτ.)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no 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 "Απέτυχε η μετατ�οπή αιτο�μενων tokens σε tokens π�όσβασης."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/repliesrss.php:72
+#, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr ""
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: 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:249
+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:261
+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:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr ""
+
+#: lib/action.php:435
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Δημιου�γία νέου λογα�ιασμο�"
+msgid "Connect to services"
+msgstr "Αδυναμία ανακατε�θηνσης στο διακομιστή: %s"
+
+#: lib/action.php:785
+msgid "Site content license"
+msgstr ""
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Απέτυχε η ενημέ�ωση χ�ήστη μέσω επιβεβαιωμένης email διε�θυνσης."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, php-format
+msgid "Reply to %s sent"
+msgstr ""
+
+#: lib/command.php:441
+msgid "Error saving notice."
+msgstr ""
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Ο κωδικός επιβεβαίωσης δεν β�έθηκε."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Πε�ιγ�άψτε την ομάδα ή το θέμα μέχ�ι 140 χα�ακτή�ες"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Πε�ιγ�άψτε την ομάδα ή το θέμα μέχ�ι 140 χα�ακτή�ες"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Μήνυμα"
+
+#: lib/mail.php:554
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr ""
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "από"
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Διαγ�αφή μην�ματος"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
index 4eeac7304..4a42208bd 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.mo
+++ b/locale/en_GB/LC_MESSAGES/statusnet.mo
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index a105d2b86..8e36a3966 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,3 +1,6 @@
+# Translation of StatusNet to British English
+#
+# --
 # #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -6,27 +9,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-05-21 01:42+0000\n"
-"Last-Translator: Bruce Cowan <l10n@bcowan.fastmail.co.uk>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:22+0000\n"
+"Language-Team: British English\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: en-gb\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Search Stream for \"%s\""
 
-# Adjusted for grammar.
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -39,17 +42,19 @@ msgid " from "
 msgstr "from"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Updates replying to %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s has invited you to join them on %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -101,11 +106,13 @@ msgstr ""
 "\n"
 "%6$s\n"
 "\n"
-"If not, you can ignore this message. Thanks for your patience and your time.\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
 "\n"
 "Sincerely, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s is now listening to your notices on %2$s."
@@ -128,25 +135,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s updates that reply to updates from %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s's status on %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Public Stream"
@@ -156,34 +166,48 @@ msgstr "%s Public Stream"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s and friends"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s public timeline"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s timeline"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s updates from everyone!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -191,16 +215,18 @@ msgstr ""
 "(You should receive a message by e-mail momentarily, with instructions on "
 "how to confirm your e-mail address.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)."
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** is a microblogging service."
@@ -212,39 +238,44 @@ msgstr ". Contributors should be attributed by full name or nickname."
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 or more characters"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 or more characters, and don't forget it!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 or more characters. Required."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -278,7 +309,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API method not found!"
 
@@ -301,16 +359,23 @@ msgstr "API method not found!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "API method under construction."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "About"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Accept"
 
@@ -321,6 +386,9 @@ msgstr "Accept"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Add"
 
@@ -338,27 +406,29 @@ msgstr "Add or remove OpenIDs"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Address"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Addresses of friends to invite (one per line)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "All subscriptions"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "All updates for %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "All updates matching search term \"%s\""
@@ -368,30 +438,37 @@ msgstr "All updates matching search term \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Already logged in."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Already subscribed!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Are you sure you want to delete this notice?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Authorise subscription"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatically login in the future; not for shared computers!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -400,18 +477,20 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Avatar updated."
 
-# Buddy?
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
-#, php-format
-#, fuzzy
+#: actions/imsettings.php:108 actions/imsettings.php:114
+#, fuzzy, 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?)"
@@ -420,6 +499,7 @@ msgstr ""
 "message with further instructions. (Did you add %s to your buddy list?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -428,11 +508,10 @@ msgstr ""
 "a message with further instructions."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Awaiting confirmation on this phone number."
 
-#  erm, not sure what to do here, » is recognised as a quotation mark.
 #: ../lib/util.php:1318 lib/util.php:1452
 msgid "Before »"
 msgstr "Before »"
@@ -440,6 +519,8 @@ msgstr "Before »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Bio"
 
@@ -447,16 +528,18 @@ msgstr "Bio"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Bio is too long (max 140 chars)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Can't delete this notice."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Can't read avatar URL '%s'"
@@ -464,6 +547,8 @@ msgstr "Can't read avatar URL '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Can't save new password."
 
@@ -471,31 +556,34 @@ msgstr "Can't save new password."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Cancel"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Cannot create OpenID consumer object."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Cannot normalise Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Cannot normalise that e-mail address"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Change"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Change e-mail handling"
 
@@ -505,11 +593,12 @@ msgid "Change password"
 msgstr "Change password"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Change your password"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Change your profile settings"
 
@@ -519,6 +608,9 @@ msgstr "Change your profile settings"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Confirm"
 
@@ -531,12 +623,14 @@ msgstr "Confirm Address"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Confirmation cancelled."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Confirmation code"
 
@@ -545,7 +639,8 @@ msgstr "Confirmation code"
 msgid "Confirmation code not found."
 msgstr "Confirmation code not found."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -579,21 +674,24 @@ msgstr ""
 "Thanks for signing up and we hope you enjoy using this service."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Connect"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Connect existing account"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Contact"
 
-#  Thought form was incorrect
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Could not create OpenID from: %s"
@@ -601,35 +699,39 @@ msgstr "Could not create OpenID from: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Could not follow user: %s is already on your list."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Could not follow user: User not found."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Could not redirect to server: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Could not save avatar info"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Could not save new profile info"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Could not subscribe other to you."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Could not subscribe."
 
@@ -649,15 +751,17 @@ msgstr "Couldn't convert request tokens to access tokens."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Couldn't delete e-mail confirmation."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Couldn't delete subscription."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Couldn't find any statuses."
 
@@ -670,29 +774,38 @@ msgstr "Couldn't get a request token."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Couldn't insert confirmation code."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Couldn't save profile."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Couldn't update user for autosubscribe."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Couldn't update user record."
 
@@ -708,42 +821,48 @@ msgstr "Couldn't update user record."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Couldn't update user."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Create"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Create a new user with this nickname."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Create new account"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Creating new account for OpenID that already has a user."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Current confirmed Jabber/GTalk address."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Current confirmed SMS-enabled phone number."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Current confirmed e-mail address."
 
@@ -752,23 +871,27 @@ msgid "Currently"
 msgstr "Currently"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "DB error inserting hashtag: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "DB error inserting reply: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Delete notice"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Describe yourself and your interests in 140 chars"
 
@@ -776,11 +899,13 @@ msgstr "Describe yourself and your interests in 140 chars"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "E-mail"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "E-mail Address"
 
@@ -790,39 +915,43 @@ msgid "Email Settings"
 msgstr "E-mail Settings"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "E-mail address already exists."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-mail address confirmation"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mail address, like \"UserName@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "E-mail addresses"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Enter a nickname or e-mail address."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Enter the code you received on your phone."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Error authorising token."
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Error connecting user to OpenID."
 
@@ -833,39 +962,46 @@ msgstr "Error connecting user."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Error inserting avatar."
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Error inserting new profile."
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Error inserting remote profile."
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Error saving address confirmation."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Error saving remote profile."
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Error saving the profile."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Error saving the user."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Error saving user; invalid."
 
@@ -874,18 +1010,20 @@ msgstr "Error saving user; invalid."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Error setting user."
 
-#  Added full stop
 #: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 #: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Error updating profile."
 
-#  Added full stop
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Error updating remote profile."
 
@@ -895,33 +1033,36 @@ msgid "Error with confirmation code."
 msgstr "Error with confirmation code."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Existing nickname"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "F.A.Q."
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Failed updating avatar."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed for friends of %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed for replies to %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Feed for tag %s"
@@ -936,7 +1077,7 @@ msgstr "Find content of notices"
 msgid "Find people on this site"
 msgstr "Find people on this site"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -949,6 +1090,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Full name"
 
@@ -957,23 +1103,33 @@ msgstr "Full name"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Full name is too long (max 255 chars)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Help"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Home"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -981,33 +1137,37 @@ msgstr "Homepage"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "I want to post notices by e-mail."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "I.M."
 
-#  possibly use I.M.
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "I.M. Address"
 
-#  requires full stops?
 #: ../actions/imsettings.php:33 actions/imsettings.php:33
 #: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "I.M. Settings"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1015,7 +1175,7 @@ msgstr ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1023,8 +1183,7 @@ msgstr ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 
-# double space here
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1035,25 +1194,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Incoming e-mail"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Incoming e-mail address removed."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Incorrect old password"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Incorrect username or password."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1061,32 +1226,32 @@ msgstr ""
 "Instructions for recovering your password have been sent to the e-mail "
 "address registered to your account."
 
-#  Avatar?
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Invalid avatar URL '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Invalid e-mail address: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Invalid homepage '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Invalid licence URL '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Invalid notice content"
 
@@ -1095,20 +1260,19 @@ msgstr "Invalid notice content"
 msgid "Invalid notice uri"
 msgstr "Invalid notice URI"
 
-# URL case
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
 #: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "Invalid notice URL"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Invalid profile URL '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "Invalid profile URL (bad format)"
 
@@ -1126,28 +1290,35 @@ msgstr "Invalid size."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Invalid username or password."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Invitation(s) sent"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Invitation(s) sent to the following people:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Invite"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Invite new users"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1159,11 +1330,12 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID already belongs to another user."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1173,12 +1345,14 @@ msgstr ""
 "add %s to your buddy list in your IM client or on GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Language"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Language is too long (max 50 chars)."
 
@@ -1187,7 +1361,15 @@ msgstr "Language is too long (max 50 chars)."
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Location"
 
@@ -1196,7 +1378,12 @@ msgstr "Location"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Location is too long (max 255 chars)."
 
@@ -1205,44 +1392,52 @@ msgstr "Location is too long (max 255 chars)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Login"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Login with an [OpenID](%%doc.openid%%) account."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
 "(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
 "%). "
 msgstr ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Logout"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Longer name, preferably your \"real\" name"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Lost or forgotten password?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Make a new e-mail address for posting to - cancels the old one."
 
@@ -1253,65 +1448,73 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Manage how you get e-mail from %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Member since"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog by %s"
 
-# Carrier?
-#: ../actions/smssettings.php:304
-#, php-format
-#, fuzzy
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
+#, fuzzy, 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 ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"e-mail but isn't listed here, send e-mail to let us know at %s."
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over e-"
+"mail but isn't listed here, send e-mail to let us know at %s."
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "My text and files are available under "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "New"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "New e-mail address for posting to %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "New nickname"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "New notice"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "New password"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "New password successfully saved. You are now logged in."
 
@@ -1321,7 +1524,13 @@ msgstr "New password successfully saved. You are now logged in."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Nickname"
 
@@ -1330,7 +1539,12 @@ msgstr "Nickname"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
 
@@ -1339,49 +1553,59 @@ msgstr "Nickname already in use. Try another one."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Nickname not allowed."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Nickname of the user you want to follow"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Nickname or e-mail"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "No"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "No Jabber ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "No authorisation request!"
 
-# Carrier?
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 #, fuzzy
 msgid "No carrier selected."
 msgstr "No carrier selected."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "No code entered"
 
@@ -1393,11 +1617,15 @@ msgstr "No confirmation code."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "No content!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "No e-mail address."
 
@@ -1406,7 +1634,9 @@ msgid "No id."
 msgstr "No id."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "No incoming e-mail address."
 
@@ -1417,6 +1647,7 @@ msgstr "No nickname provided by remote server."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "No nickname."
 
@@ -1424,12 +1655,14 @@ msgstr "No nickname."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "No pending confirmation to cancel."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "No phone number."
 
@@ -1439,7 +1672,8 @@ msgid "No profile URL returned by server."
 msgstr "No profile URL returned by server."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "No registered e-mail address for that user."
 
@@ -1451,7 +1685,7 @@ msgstr "No request found!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "No results"
 
@@ -1462,12 +1696,16 @@ msgstr "No size."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "No status found with that ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "No status with that ID found."
 
@@ -1477,13 +1715,15 @@ msgid "No such OpenID."
 msgstr "No such OpenID."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "No such document."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No such notice."
 
@@ -1521,12 +1761,22 @@ msgstr "No such subscription"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "No such user."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "No user with that e-mail address or username."
 
@@ -1540,33 +1790,38 @@ msgid "Not a recovery code."
 msgstr "Not a recovery code."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Not a registered user."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Not a supported data format."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Not a valid Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Not a valid OpenID."
 
-# Missing full stop, needs to merge with: actions/register.php:63 actions/register.php:70 actions/register.php:152
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Not a valid e-mail address."
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Not a valid e-mail address."
 
@@ -1574,6 +1829,11 @@ msgstr "Not a valid e-mail address."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 
@@ -1593,7 +1853,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Not a valid profile URL (no YADIS document)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Not an image or corrupt file."
 
@@ -1604,11 +1865,13 @@ msgstr "Not authorised."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Not expecting this response!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Not found"
 
@@ -1624,12 +1887,15 @@ msgstr "Not found"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Not logged in."
 
-# removed full stop
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Not subscribed!"
 
@@ -1646,39 +1912,44 @@ msgid "Notice feed for %s"
 msgstr "Notice feed for %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Notice has no profile"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Notices"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notices tagged with %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Old password"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "OpenID Account Setup"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "OpenID Auto-Submit"
 
@@ -1686,29 +1957,34 @@ msgstr "OpenID Auto-Submit"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "OpenID Login"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "OpenID authentication cancelled."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID authentication failed: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID failure: %s"
@@ -1724,11 +2000,12 @@ msgid "OpenID settings"
 msgstr "OpenID settings"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Optionally add a personal message to the invitation."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Partial upload."
 
@@ -1738,34 +2015,46 @@ msgstr "Partial upload."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Password"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Password and confirmation do not match."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Password must be 6 chars or more."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Password recovery requested"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Password saved."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Passwords don't match."
 
@@ -1785,14 +2074,17 @@ msgid "People search"
 msgstr "People Search"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Personal"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Personal message"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Phone number, no punctuation or spaces, with area code"
 
@@ -1807,7 +2099,7 @@ msgstr ""
 "click \"Cancel\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
@@ -1816,7 +2108,9 @@ msgstr "Post a notice when my Jabber/GTalk status changes."
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -1825,42 +2119,52 @@ msgstr "Preferences"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Preferred language"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Privacy"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Problem saving notice."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profile"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "Profile URL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profile settings"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Profile unknown"
 
@@ -1869,17 +2173,19 @@ msgid "Public Stream Feed"
 msgstr "Public Stream Feed"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Public timeline"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publish a MicroID for my Jabber/GTalk address."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publish a MicroID for my e-mail address."
 
@@ -1889,12 +2195,14 @@ msgid "Recent Tags"
 msgstr "Recent Tags"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Recover"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Recover password"
 
@@ -1907,37 +2215,45 @@ msgstr "Recovery code for unknown user."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Register"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Registration not allowed."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Registration successful"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Reject"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Remember me"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Remote profile with no matching profile"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Remote subscribe"
 
@@ -1951,6 +2267,9 @@ msgstr "Remote subscribe"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Remove"
 
@@ -1959,7 +2278,7 @@ msgstr "Remove"
 msgid "Remove OpenID"
 msgstr "Remove OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1968,34 +2287,41 @@ msgstr ""
 "remove it, add another OpenID first."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Replies"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Replies to %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Reset"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Reset password"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "SMS Phone number"
 
@@ -2004,17 +2330,18 @@ msgstr "SMS Phone number"
 msgid "SMS Settings"
 msgstr "SMS Settings"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "SMS confirmation"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Same as password above"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Same as password above. Required."
 
@@ -2027,12 +2354,21 @@ msgstr "Same as password above. Required."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Save"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Search"
 
@@ -2042,7 +2378,7 @@ msgid "Search Stream Feed"
 msgstr "Search Stream Feed"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2051,7 +2387,7 @@ msgstr ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2060,37 +2396,40 @@ msgstr ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 
-# Carrier?
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 #, fuzzy
 msgid "Select a carrier"
 msgstr "Select a carrier"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Send"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Send e-mail to this address to post new notices."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send me notices of new subscriptions through e-mail."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send me notices through Jabber/GTalk."
 
-# Carrier
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 #, fuzzy
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
@@ -2100,15 +2439,19 @@ msgstr ""
 "from my carrier."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Send me replies through Jabber/GTalk from people I'm not subscribed to."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Settings"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Settings saved."
 
@@ -2128,27 +2471,32 @@ msgid "Something weird happened."
 msgstr "Something weird happened."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Sorry, no incoming e-mail allowed."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Sorry, that is not your incoming e-mail address."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Source"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Statistics"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Stored OpenID not found."
 
@@ -2156,24 +2504,28 @@ msgstr "Stored OpenID not found."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Subscribe"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Subscribers"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Subscription authorised"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Subscription rejected"
 
@@ -2181,28 +2533,35 @@ msgstr "Subscription rejected"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subscriptions"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "System error uploading file."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Tags"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Text"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Text search"
 
@@ -2222,6 +2581,7 @@ msgid "That confirmation code is not for you!"
 msgstr "That confirmation code is not for you!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "That e-mail address already belongs to another user."
 
@@ -2231,63 +2591,73 @@ msgid "That file is too big."
 msgstr "That file is too big."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "That is already your Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "That is already your e-mail address."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "That is already your phone number."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "That is not your Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "That is not your e-mail address."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "That is not your phone number."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "That is the wrong IM address."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "That is the wrong confirmation number."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "That phone number already belongs to another user."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "That's too long. Max notice size is 140 chars."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "That's too long. Max notice size is 255 chars."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "The address \"%s\" has been confirmed for your account."
@@ -2296,11 +2666,14 @@ msgstr "The address \"%s\" has been confirmed for your account."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "The address was removed."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2310,7 +2683,8 @@ msgstr ""
 "with the site's instructions for details on how to authorise the "
 "subscription. Your subscription token is:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2321,35 +2695,39 @@ msgstr ""
 "subscription."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "These are the people who listen to %s's notices."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "These are the people who listen to your notices."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "These are the people whose notices %s listens to."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "These are the people whose notices you listen to."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+"These people are already users and you were automatically subscribed to them:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "This confirmation code is too old. Please start again."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2358,7 +2736,7 @@ msgstr ""
 "button to go to your OpenID provider."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2373,6 +2751,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "This method requires a POST or DELETE."
 
@@ -2381,50 +2762,63 @@ msgstr "This method requires a POST or DELETE."
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "This method requires a POST."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "This page is not available in a media type you accept"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Timezone"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Timezone not selected."
 
-# double space.
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: 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 ""
-"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."
+"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."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Two user ids or screen_names must be supplied."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL of your homepage, blog, or profile on another site"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL of your profile on another compatible microblogging service"
 
@@ -2436,15 +2830,22 @@ msgstr "URL of your profile on another compatible microblogging service"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Unexpected password reset."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Unknown action"
 
@@ -2475,38 +2876,47 @@ msgstr "Unsubscribe"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Unsupported OMB version"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Unsupported image file format."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Updates by SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Updates by instant messenger (I.M.)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates from %1$s and friends on %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Updates from %1$s on %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Upload"
 
@@ -2527,13 +2937,16 @@ msgid "Upload a new profile image"
 msgstr "Upload a new profile image"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "Use this form to invite your friends and colleagues to use this service."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Used only for updates, announcements, and password recovery"
 
@@ -2557,11 +2970,16 @@ msgstr "User being listened to doesn't exist."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "User has no profile."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "User nickname"
 
@@ -2570,29 +2988,33 @@ msgid "User not found."
 msgstr "User not found."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "In which timezone are you?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Where you are, like \"City, State (or Region), Country\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Wrong image type for '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Wrong size image at '%s'"
@@ -2600,7 +3022,9 @@ msgstr "Wrong size image at '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Yes"
 
@@ -2623,11 +3047,12 @@ msgid "You are already logged in!"
 msgstr "You are already logged in!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "You are already subscribed to these users:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "You are not friends with the specified user."
 
@@ -2645,7 +3070,7 @@ msgstr "You can create a new account to start posting notices."
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "You can receive SMS messages through e-mail from %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
@@ -2654,40 +3079,43 @@ msgstr ""
 "\"Remove\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "You can use the local subscription!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "You can't register if you don't agree to the licence."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "You did not send us that profile"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2709,16 +3137,19 @@ msgstr ""
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "You may not delete another user's status."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "You must be logged in to invite other users to use %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2726,22 +3157,21 @@ msgstr ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 
-# extra spaces.
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "You've been identified. Enter a  new password below. "
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "Your OpenID URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Your nickname on this server, or your registered e-mail address."
 
-# extra spaces.
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2750,47 +3180,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
 "account. Manage your associated OpenIDs from here."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "a few seconds ago"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "about %d days ago"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "about %d hours ago"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "about %d minutes ago"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "about %d months ago"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "about a day ago"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "about a minute ago"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "about a month ago"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "about a year ago"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "about an hour ago"
 
@@ -2812,16 +3252,17 @@ msgid "reply"
 msgstr "reply"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "same as password above"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "unsupported file type"
 
-#  erm, not sure what to do here, « is recognised as a quotation mark.
 #: ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
 msgstr "� After"
@@ -2839,6 +3280,26 @@ msgstr "� After"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "There was a problem with your session token. Try again, please."
 
@@ -2847,6 +3308,7 @@ msgid "This notice is not a favorite!"
 msgstr "This notice is not a favourite!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Could not delete favourite."
 
@@ -2854,22 +3316,28 @@ msgstr "Could not delete favourite."
 msgid "Favor"
 msgstr "Favour"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Send me e-mail when someone adds my notice as a favourite."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Send me e-mail when someone sends me a private message."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "This notice is already a favourite!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Could not create favourite."
 
@@ -2879,11 +3347,13 @@ msgstr "Disfavour"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s's favorite notices"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Feed of favourite notices of %s"
@@ -2911,7 +3381,6 @@ msgstr ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
 
-# extra space?
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
 msgid "Automatically login in the future; "
@@ -2926,34 +3395,45 @@ msgid "Login with your username and password. "
 msgstr "Login with your username and password. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "That's too long. Max message size is 140 chars."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "No recipient specified."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "You can't send a message to this user."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "No such user"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "New message"
 
@@ -3008,6 +3488,11 @@ msgstr "You can update your personal profile info here "
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "User without matching profile"
 
@@ -3036,6 +3521,8 @@ msgid "New password successfully saved. "
 msgstr "New password successfully saved. "
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Password must be 6 or more characters."
 
@@ -3058,12 +3545,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "To subscribe, you can [login](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Feed for favourites of %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Could not retrieve favourite notices."
 
@@ -3071,7 +3561,7 @@ msgstr "Could not retrieve favourite notices."
 msgid "No such message."
 msgstr "No such message."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Only the sender and recipient may read this message."
 
@@ -3089,59 +3579,76 @@ msgstr "Message from %1$s on %2$s"
 msgid "Send a message"
 msgstr "Send a message"
 
-# Carrier?
 #: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "Mobile carrier for your phone. "
 msgstr "Mobile carrier for your phone. "
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direct messages to %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "All the direct messages sent to %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Direct Messages You've Sent"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "All the direct messages sent from %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "No message text!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Recipient user not found."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Can't send direct messages to users who aren't your friend."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favourites from %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s updates favourited by %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s added your notice as a favourite"
@@ -3163,14 +3670,17 @@ msgstr ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Twitter settings"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Twitter Account"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Current verified Twitter account."
 
@@ -3179,6 +3689,7 @@ msgid "Twitter Username"
 msgstr "Twitter Username"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "No spaces, please."
 
@@ -3187,18 +3698,22 @@ msgid "Twitter Password"
 msgstr "Twitter Password"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Automatically send my notices to Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Send local \"@\" replies to Twitter."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Subscribe to my Twitter friends here."
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3207,6 +3722,7 @@ msgstr ""
 "underscore (_). 15 chars max."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "Could not verify your Twitter credentials!"
 
@@ -3217,33 +3733,43 @@ msgstr "Unable to retrieve account information for \"%s\" from Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "Unable to save your Twitter settings!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Twitter settings saved."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "That is not your Twitter account."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "Couldn't remove Twitter user."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Twitter account removed."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "Couldn't save Twitter preferences."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Twitter preferences saved."
 
@@ -3260,18 +3786,19 @@ msgid "The subscription has been rejected, but no "
 msgstr "The subscription has been rejected, but no "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Command results"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Command complete"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Command failed"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Sorry, this command is not yet implemented."
 
@@ -3281,89 +3808,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "Subscriptions: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "User has no last notice"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullname: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Message too long - maximum is 140 characters, you sent %d"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Direct message to %s sent"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Error sending direct message."
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Specify the name of the user to subscribe to"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Subscribed to %s"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Specify the name of the user to unsubscribe from"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Unsubscribed from %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Notification off."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Notification on."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 
@@ -3371,11 +3920,11 @@ msgstr "Can't turn on notification."
 msgid "Commands:\n"
 msgstr "Commands:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "Could not insert message."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "Could not update message with new URI."
 
@@ -3392,7 +3941,7 @@ msgstr ""
 "You have a new posting address on %1$s.\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "New private message from %s"
@@ -3406,7 +3955,7 @@ msgstr ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "Only the user can read their own mailboxes."
 
@@ -3415,31 +3964,39 @@ msgid "This form should automatically submit itself. "
 msgstr "This form should automatically submit itself. "
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Favourites"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s's favourite notices"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "User"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Inbox"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Your incoming messages"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Outbox"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Your sent messages"
 
@@ -3452,14 +4009,19 @@ msgid "Twitter integration options"
 msgstr "Twitter integration options"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "To"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "Could not parse message."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s and friends, page %d"
@@ -3468,23 +4030,32 @@ msgstr "%s and friends, page %d"
 msgid "You can upload your personal avatar."
 msgstr "You can upload your personal avatar."
 
-#  requires full stops?
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Avatar settings"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Preview"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Crop"
 
@@ -3501,34 +4072,43 @@ msgid "There was a problem with your session token. "
 msgstr "There was a problem with your session token. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Pick a square area of the image to be your avatar"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Lost our file data."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "Lost our file."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "Unknown file type"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "No profile specified."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "No profile with that ID."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Block user"
 
@@ -3536,11 +4116,11 @@ msgstr "Block user"
 msgid "Are you sure you want to block this user? "
 msgstr "Are you sure you want to block this user? "
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "You have already blocked this user."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "Failed to save block information."
 
@@ -3557,38 +4137,56 @@ msgstr "You are about to permanently delete a notice. "
 msgid "Add to favorites"
 msgstr "Add to favourites"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Edit %s group"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr "Inboxes must be enabled for groups to work"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "You must be logged in to create a group."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "No nickname"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "No such group"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "You must be an admin to edit the group"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Use this form to edit the group."
 
@@ -3597,14 +4195,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr "Nickname must have only lowercase letters "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "description is too long (max 140 chars)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "Could not update group."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "Options saved."
 
@@ -3621,7 +4220,8 @@ msgstr "Make a new e-mail address for posting to; "
 msgid "Send me email when someone "
 msgstr "Send me e-mail when someone "
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Allow friends to nudge me and send me an e-mail."
 
@@ -3633,7 +4233,7 @@ msgstr "That e-mail address already belongs "
 msgid "A confirmation code was sent to the email address you added. "
 msgstr "A confirmation code was sent to the e-mail address you added. "
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "Server error - couldn't get user!"
 
@@ -3647,53 +4247,66 @@ msgstr "If you would like the %s app to automatically update "
 msgid "Allow %s to update my Facebook status"
 msgstr "Allow %s to update my Facebook status"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Skip"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr "No notice content!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Pagination"
 
-#  erm, not sure what to do here, « is recognised as a quotation mark.
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "After"
 
-#  erm, not sure what to do here, » is recognised as a quotation mark.
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "Before"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Thanks for inviting your friends to use %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "Invitations have been sent to the following users:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "You have been invited to %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr "Invite your friends to use %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Friends already using %s:"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Send invitations"
@@ -3735,12 +4348,14 @@ msgstr "If you would like %s to automatically update "
 msgid "Sync preferences"
 msgstr "Sync preferences"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Disfavor favourite"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Popular notices"
 
@@ -3754,7 +4369,8 @@ msgid "The most popular notices on the site right now."
 msgstr "The most popular notices on the site right now."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Featured users"
 
@@ -3768,15 +4384,17 @@ msgstr "Featured users, page %d"
 msgid "A selection of some of the great users on %s"
 msgstr "A selection of some of the great users on %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "That user has blocked you from subscribing."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "No ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Group logo"
 
@@ -3784,11 +4402,13 @@ msgstr "Group logo"
 msgid "You can upload a logo image for your group."
 msgstr "You can upload a logo image for your group."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Logo updated."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "Failed updating logo."
 
@@ -3807,7 +4427,8 @@ msgid "A list of the users in this group."
 msgstr "A list of the users in this group."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Groups"
 
@@ -3822,6 +4443,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "%%%%site.name%%%% groups let you find and talk with "
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "Create a new group"
 
@@ -3832,7 +4454,7 @@ msgid ""
 msgstr ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Group search"
 
@@ -3854,20 +4476,20 @@ msgstr "Send me replies through Jabber/GTalk "
 msgid "A confirmation code was sent "
 msgstr "A confirmation code was sent "
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "You must be logged in to join a group."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "You are already a member of that group"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Could not join user %s to group %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s joined group %s"
@@ -3876,15 +4498,18 @@ msgstr "%s joined group %s"
 msgid "Inboxes must be enabled for groups to work."
 msgstr "Inboxes must be enabled for groups to work."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "You must be logged in to leave a group."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "No such group."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "You are not a member of that group."
 
@@ -3892,22 +4517,25 @@ msgstr "You are not a member of that group."
 msgid "You may not leave a group while you are its administrator."
 msgstr "You may not leave a group while you are its administrator."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr "Could not find membership record."
 
-#  Thought form was incorrect
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Could not remove user %s to group %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s left group %s"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "Login to site"
 
@@ -3919,15 +4547,17 @@ msgstr "No current status"
 msgid "New group"
 msgstr "New group"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "Use this form to create a new group."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "Could not create group."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr "Could not set group membership."
 
@@ -3939,11 +4569,14 @@ msgstr "That's too long. "
 msgid "Don't send a message to yourself; "
 msgstr "Don't send a message to yourself; "
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "Notice posted"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Ajax Error"
 
@@ -3961,7 +4594,7 @@ msgstr "Nudge sent"
 msgid "Nudge sent!"
 msgstr "Nudge sent!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr "OpenID login"
 
@@ -3969,7 +4602,6 @@ msgstr "OpenID login"
 msgid "Removing your only OpenID "
 msgstr "Removing your only OpenID "
 
-#  requires full stops?
 #: actions/othersettings.php:60
 msgid "Other Settings"
 msgstr "Other Settings"
@@ -3986,11 +4618,13 @@ msgstr "URL Auto-shortening"
 msgid "Service"
 msgstr "Service"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Automatic shortening service to use."
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL shortening service is too long (max 50 chars)."
 
@@ -3998,16 +4632,17 @@ msgstr "URL shortening service is too long (max 50 chars)."
 msgid "Change your password."
 msgstr "Change your password."
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr "Password change"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Not a valid people tag: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Users self-tagged with %s - page %d"
@@ -4017,36 +4652,41 @@ msgstr "Users self-tagged with %s - page %d"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "These are users who have tagged themselves \"%s\" "
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profile information"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 
 #: actions/profilesettings.php:144
 msgid "Automatically subscribe to whoever "
 msgstr "Automatically subscribe to whoever "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Invalid tag: \"%s\""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "Couldn't save tags."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Public timeline, page %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Could not retrieve public stream."
 
@@ -4056,8 +4696,8 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki"
-"/Micro-blogging) service "
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4068,11 +4708,13 @@ msgstr "Public tag cloud"
 msgid "These are most popular recent tags on %s "
 msgstr "These are most popular recent tags on %s "
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "Tag cloud"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Sorry, only invited people can register."
 
@@ -4121,7 +4763,8 @@ msgstr "(You should receive a message by e-mail "
 msgid "That's a local profile! Login to subscribe."
 msgstr "That's a local profile! Login to subscribe."
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Replies to %s, page %d"
@@ -4131,50 +4774,71 @@ msgstr "Replies to %s, page %d"
 msgid "%s favorite notices, page %d"
 msgstr "%s favourite notices, page %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s group"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s group, page %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Group profile"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr "Note"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Group actions"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr "Notice feed for %s group"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Members"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(None)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "All members"
 
@@ -4184,14 +4848,14 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
 msgstr "Only the sender and recipient "
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, page %d"
@@ -4201,30 +4865,37 @@ msgid "'s profile"
 msgstr "'s profile"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "User profile"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Photo"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "User actions"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "Send a direct message to this user"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Message"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "All subscribers"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "All groups"
 
@@ -4234,8 +4905,8 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
 
 #: actions/smssettings.php:128
 msgid "Phone number, no punctuation or spaces, "
@@ -4249,8 +4920,7 @@ msgstr "Send me notices through SMS; "
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "A confirmation code was sent to the phone number you added. "
 
-# Carrier?
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Mobile carrier"
@@ -4309,16 +4979,17 @@ msgstr "These are the people whose notices "
 msgid "These are the people whose "
 msgstr "These are the people whose "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Notices tagged with %s, page %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "Messages tagged \"%s\", most recent first"
@@ -4340,7 +5011,7 @@ msgstr "Tag %s"
 msgid "Tag user"
 msgstr "Tag user"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4352,17 +5023,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "There was a problem with your session token."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Could not save tags."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Use this form to add tags to your subscribers or subscriptions."
 
@@ -4370,20 +5041,23 @@ msgstr "Use this form to add tags to your subscribers or subscriptions."
 msgid "No such tag."
 msgstr "No such tag."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "Microblog tagged with %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Block user failed."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "Unblock user failed."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Not found."
 
@@ -4391,15 +5065,16 @@ msgstr "Not found."
 msgid "Add your Twitter account to automatically send "
 msgstr "Add your Twitter account to automatically send "
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Twitter user name"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Twitter password"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Twitter Friends"
 
@@ -4412,144 +5087,153 @@ msgstr "Username must have only numbers, "
 msgid "Unable to retrieve account information "
 msgstr "Unable to retrieve account information "
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "Error removing the block."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "No profile id in request."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "No profile with that id."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "%s groups"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s groups, page %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem saving notice. Unknown user."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "You are banned from posting notices on this site."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Upload an avatar"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Other"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Other options"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Untitled page"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Primary site navigation"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Personal profile and friends timeline"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Search for people or text"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Account"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Change your e-mail, avatar, password, profile"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Connect to IM, SMS, Twitter"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Logout from the site"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Login to the site"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Create an account"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "Login with OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "Help me!"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr "Site notice"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "Local views"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr "Page notice"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Secondary site navigation"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "StatusNet software licence"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "All "
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "licence."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "Block this user"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Block"
 
@@ -4562,11 +5246,14 @@ msgstr "Disfavour this notice"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "To use the %s Facebook Application you need to login "
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr " a new account."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "Published"
 
@@ -4586,53 +5273,59 @@ msgstr "Filter tags"
 msgid "All"
 msgstr "All"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Tag"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Choose a tag to narrow list"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Go"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL of the homepage or blog of the group or topic"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Description"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Describe the group or topic in 140 chars"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Group"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "Admin"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Edit %s group properties"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Add or edit %s logo"
@@ -4662,11 +5355,11 @@ msgstr "Join"
 msgid "Leave"
 msgstr "Leave"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Login with a username and password"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Sign up for a new account"
 
@@ -4688,17 +5381,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s is now listening to "
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Location: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Homepage: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4707,7 +5400,7 @@ msgstr ""
 "Bio: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "You've been nudged by %s"
@@ -4722,39 +5415,47 @@ msgstr "%1$s (%2$s) is wondering what you are up to "
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s just added your notice from %2$s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "From"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Send a direct notice"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "Send a notice"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Available characters"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "in reply to"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Reply"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Delete this notice"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Delete"
 
@@ -4775,27 +5476,29 @@ msgstr "Send a nudge to this user"
 msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(none)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Public"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "User groups"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Recent tags"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Featured"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
@@ -4811,31 +5514,33 @@ msgstr "Find groups on this site"
 msgid "Untitled section"
 msgstr "Untitled section"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "People %s subscribes to"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "People subscribed to %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Groups %s is a member of"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invite friends and colleagues to join you on %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "User has blocked you."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Subscribe to this user"
 
@@ -4848,10 +5553,11 @@ msgid "Top posters"
 msgstr "Top posters"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Unblock this user"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Unblock"
 
@@ -4859,22 +5565,2060 @@ msgstr "Unblock"
 msgid "Unsubscribe from this user"
 msgstr "Unsubscribe from this user"
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed for friends of %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed for friends of %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed for friends of %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s and friends"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "You can upload your personal avatar."
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar updated."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"You are about to permanently delete a notice.  Once this is done, it cannot "
+"be undone."
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "There was a problem with your session token. Try again, please."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Send me e-mail when someone sends me a private message."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "You can upload a logo image for your group."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Pick a square area of the image to be your avatar"
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Microblog by %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Error sending direct message."
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Search Stream for \"%s\""
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Public Stream Feed"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Public Stream Feed"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Public Stream Feed"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" except this private data: password, e-mail address, IM address, phone "
+"number."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Create"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Group profile"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "'s profile"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Notice feed for %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Notice feed for %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Notice feed for %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Outbox for %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profile settings"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "No such user"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Unable to retrieve account information for \"%s\" from Twitter."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"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 \"Cancel\"."
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Search for people or text"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Connect to IM, SMS, Twitter"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Nudge"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "To use the %s Facebook Application you need to login "
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Search"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "No such document."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "A list of the users in this group."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "A list of the users in this group."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "User profile"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s and friends, page %d"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "A list of the users in this group."
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Unblock user failed."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Confirmation code"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Can't delete this notice."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Invalid tag: \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Nickname already in use. Try another one."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Could not create favourite."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "New notice"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "New notice"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Not a valid nickname."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "No profile specified."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "User has blocked you."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "You are not a member of that group."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Create new account"
+msgid "Block user from group"
+msgstr "Block user"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "You must be logged in to create a group."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Groups"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Couldn't update user."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Unable to save your Twitter settings!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Sync preferences saved."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "You must be an admin to edit the group"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Admin"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "No results"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "User has blocked you."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Message"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Couldn't save profile."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profile settings"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Couldn’t confirm e-mail."
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#~ msgid "Email address"
-#~ msgstr "E-mail address"
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Error inserting notice"
+#: 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 ""
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "If you’ve forgotten or lost your password, you can get a new one sent to "
-#~ "the e-mail address you have stored in your account."
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"e-mail address you have stored  in your account."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "You've been identified. Enter a  new password below. "
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Password recovery requested"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Error with confirmation code."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Subscribe to this user"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s favourite notices, page %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Notice feed for %s group"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Notice feed for %s group"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Notice feed for %s group"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Admin"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Not a local user."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Notices tagged with %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Notice feed for %s group"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s is now listening to "
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Notice feed for %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Notice feed for %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "This notice is already a favourite!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "This notice is not a favourite!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Could not retrieve public stream."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "No recipient specified."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Couldn't find any statuses."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Updates replying to %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Updates from %1$s on %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "licence."
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s subscriptions"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profile settings"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "You are not a member of that group."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problem saving notice."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Message to %1$s on %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "User profile"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profile"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Upload"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Change your password"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Connect"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Search"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Login"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Block"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Block user"
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Add or edit %s logo"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "No content!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "User"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Search"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Homepage is not a valid URL."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "No such tag."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Direct messages to %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "That's too long. Max message size is 140 chars."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Could not follow user: User not found."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "description is too long (max 140 chars)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "You are already a member of that group"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Could not join user %s to group %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "You are not a member of that group."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Could not remove user %s to group %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s groups"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Groups %s is a member of"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Group actions"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar updated."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "That's too long. Max notice size is 140 chars."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Unsupported image file format."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Photo"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "description is too long (max 140 chars)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Updates from %1$s on %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "User being listened to doesn't exist."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Not authorised."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Couldn't convert request tokens to access tokens."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Unknown version of OMB protocol."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "No such notice."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Lost our file."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Updates from %1$s on %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "This page is not available in a "
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Updates from %1$s on %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "All updates matching search term \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Connect"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Describe yourself and your interests in 140 chars"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Describe yourself and your "
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Bio is too long (max 140 chars)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Not a valid profile URL (no YADIS document)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "That's a local profile! Login to subscribe."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Couldn't get a request token."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Notice feed for %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Notice feed for %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Notice feed for %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Message to %1$s on %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed for friends of %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed for friends of %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed for friends of %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Outbox for %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Notice posted"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "This page is not available in a "
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Notice feed for %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"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 \"Cancel\"."
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"The subscription has been authorised, but no callback URL was passed. Check "
+"with the site's instructions for details on how to authorise the "
+"subscription. Your subscription token is:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"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."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Can't read avatar URL '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Wrong image type for '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Could not redirect to server: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet software licence"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Couldn't update user with confirmed e-mail address."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Nudge sent"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Message too long - maximum is 140 characters, you sent %d"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Message too long - maximum is 140 characters, you sent %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Reply to this notice"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problem saving notice."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "No confirmation code."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Login to the site"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Select a carrier"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Describe the group or topic in 140 chars"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Describe the group or topic in 140 chars"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "New notice"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s added your notice as a favourite"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "from"
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Could not retrieve public stream."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Delete notice"
diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo
index 05eabcc75..a9e9e6bc7 100644
--- a/locale/es/LC_MESSAGES/statusnet.mo
+++ b/locale/es/LC_MESSAGES/statusnet.mo
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index c0e69e3a7..54a2025f1 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -1,3 +1,6 @@
+# Translation of StatusNet to Spanish
+#
+# --
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -5,26 +8,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-07-12 05:49+0000\n"
-"Last-Translator: Jorge <xchido@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:30+0000\n"
+"Language-Team: Spanish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: es\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Busca \"%s\" en la Corriente"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -37,19 +41,20 @@ msgid " from "
 msgstr "desde"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Actualizaciones en respuesta a %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s te ha invitado a que te unas con el/ellos en %2$s"
 
-#: ../actions/invite.php:170
-#, php-format
-#, fuzzy
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
+#, fuzzy, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
@@ -106,6 +111,7 @@ msgstr ""
 "Sinceramente, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ahora está escuchando tus avisos en %2$s"
@@ -128,25 +134,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "estado de %1$s en %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "Mensajes publicos de %s"
@@ -156,34 +165,48 @@ msgstr "Mensajes publicos de %s"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s y amigos"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "línea temporal pública de %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "estado de %s"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "línea temporal de %s"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "¡Actualizaciones de todos en %s!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -191,7 +214,8 @@ msgstr ""
 "(Deberías recibir un mensaje por correo eléctronico en unos momentos, con "
 "instrucciones sobre cómo confirmar tu dirección de correo.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -200,7 +224,8 @@ msgstr ""
 "**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
 "site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** es un servicio de microblogueo."
@@ -212,33 +237,37 @@ msgstr ". Los colaboradores deben ser citados por su nombre completo o apodo."
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 letras en minúscula o números, sin signos de puntuación o espacios"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 letras en minúscula o números, sin signos de puntuación o espacios. "
 "Requerido."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 o más caracteres"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o más caracteres, ¡no te olvides!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 o más caracters. Requerido."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -249,6 +278,7 @@ msgstr ""
 "mensajes."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -284,7 +314,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "¡No se encontró el método de la API!"
 
@@ -307,16 +364,23 @@ msgstr "¡No se encontró el método de la API!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "Método API en construcción."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Acerca de"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Aceptar"
 
@@ -327,6 +391,9 @@ msgstr "Aceptar"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Añadir"
 
@@ -344,27 +411,29 @@ msgstr "Agregar o quitar OpenIDs"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Dirección"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Direcciones de los amigos a invitar (una por línea)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Todas las suscripciones"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Todas las actualizaciones para %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Todas las actualizaciones que corresponden a la frase a buscar \"%s\""
@@ -374,32 +443,39 @@ msgstr "Todas las actualizaciones que corresponden a la frase a buscar \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Ya estás conectado."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "¡Ya está suscrito!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "¿Estás seguro de que quieres eliminar este aviso?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorizar la suscripción"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
 "compartidos! "
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -409,15 +485,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Avatar actualizado"
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -428,6 +508,7 @@ msgstr ""
 "de amigos?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -436,7 +517,7 @@ msgstr ""
 "la de spam!) por un mensaje con las instrucciones."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Esperando confirmación de este número de teléfono."
 
@@ -448,6 +529,8 @@ msgstr "Antes »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Biografía"
 
@@ -455,16 +538,18 @@ msgstr "Biografía"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "No se puede eliminar este aviso."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "No se puede leer el URL del avatar '%s'"
@@ -472,6 +557,8 @@ msgstr "No se puede leer el URL del avatar '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
@@ -479,31 +566,34 @@ msgstr "No se puede guardar la nueva contraseña."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Imposible crear una instancia del objeto OpenID."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "No se puede normalizar este Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "No se puede normalizar esta dirección de correo electrónico."
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Cambiar"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Cambiar el manejo del correo."
 
@@ -513,11 +603,12 @@ msgid "Change password"
 msgstr "Cambiar contraseña"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Cambia tu contraseña"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Cambia tus opciones de perfil"
 
@@ -527,6 +618,9 @@ msgstr "Cambia tus opciones de perfil"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -539,12 +633,14 @@ msgstr "Confirmar la dirección"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Confirmación cancelada."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Código de confirmación"
 
@@ -553,7 +649,8 @@ msgstr "Código de confirmación"
 msgid "Confirmation code not found."
 msgstr "Código de confirmación no encontrado."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -571,7 +668,8 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"¡Felicitaciones, %s! Y bienvenido a %%%%site.name%%%%. Desde aquí, puedes...\n"
+"¡Felicitaciones, %s! Y bienvenido a %%%%site.name%%%%. Desde aquí, "
+"puedes...\n"
 "\n"
 "* Ir a [tu perfil](%s) y enviar tu primer mensaje.\n"
 "* Agregar una [cuenta Jabber/Gtalk](%%%%action.imsettings%%%%) para enviar "
@@ -586,20 +684,24 @@ msgstr ""
 "Gracias por suscribirte y esperamos que disfrutes el uso de este servicio."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Conectarse"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Conectarse a una cuenta existente"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Ponerse en contacto"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "No se pudo crear el formulario OpenID: %s"
@@ -607,43 +709,48 @@ msgstr "No se pudo crear el formulario OpenID: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "No puede seguir al usuario: %s ya esta en su lista."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "No puede seguir al usuario. Usuario no encontrado"
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "No se pudo redirigir al servidor: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "No se pudo guardar la información del avatar"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "No se pudo guardar la información del nuevo perfil"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 #, fuzzy
 msgid "Could not subscribe other to you."
 msgstr "No se pudo suscribir otro a tí."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "No se pudo suscribir."
 
 #: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr "No se pudo actualizar el usuario con la dirección de correo confirmada."
+msgstr ""
+"No se pudo actualizar el usuario con la dirección de correo confirmada."
 
 #: ../actions/finishremotesubscribe.php:99
 #: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
@@ -656,15 +763,17 @@ msgstr "No se pudieron convertir las clavesde petición a claves de acceso."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "No se pudo eliminar la confirmación de correo electrónico."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "No se pudo eliminar la suscripción."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "No se pudo encontrar ningún estado."
 
@@ -677,29 +786,38 @@ msgstr "No se pudo obtener la señal de petición."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "No se pudo insertar el código de confirmación."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "No se pudo insertar una nueva suscripción."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "No se pudo guardar el perfil."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "No se pudo actualizar el usuario para autosuscribirse."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "No se pudo actualizar información de usuario."
 
@@ -715,42 +833,48 @@ msgstr "No se pudo actualizar información de usuario."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "No se pudo actualizar el usuario."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Crear"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Crear un nuevo usuario con este apodo."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Crear una nueva cuenta"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Crear nueva cuenta para un OpenID que ya tiene un usuario."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Dirección actual Jabber/Gtalk confirmada."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Actual número telefónico para SMS confirmado."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Actual dirección de correo electrónico confirmada"
 
@@ -758,25 +882,28 @@ msgstr "Actual dirección de correo electrónico confirmada"
 msgid "Currently"
 msgstr "Actualmente"
 
-# 'Hash' existe en español (http://es.wikipedia.org/wiki/Hash) pero lo cambio por 'clave' para ser más claros - @fauno
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Error de la BD al insertar la etiqueta clave: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Error de BD al insertar respuesta: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Borrar aviso"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres"
 
@@ -784,11 +911,13 @@ msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Correo electrónico"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Correo Electrónico"
 
@@ -798,39 +927,43 @@ msgid "Email Settings"
 msgstr "Opciones de Email"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "La dirección de correo electrónico ya existe."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmación de correo electrónico"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Correo electrónico, como \"NombredeUsuario@ejemplo.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Direcciones de correo electrónico"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Ingresa un apodo o correo electronico"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Ingrese el código recibido en su teléfono"
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Error al autorizar clave"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Error al conectar tu usuario a OpenID"
 
@@ -841,39 +974,46 @@ msgstr "Error al conectar usuario"
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Error al insertar el avatar"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Error al insertar el nuevo perfil"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Error al insertar perfil remoto"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Error al guardar confirmación de la dirección."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Error al guardar perfil remoto"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Error al guardar el perfil."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Error al guardar el usuario."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Error al guardar el usuario; inválido."
 
@@ -882,6 +1022,9 @@ msgstr "Error al guardar el usuario; inválido."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Error al configurar el usuario."
 
@@ -892,6 +1035,7 @@ msgstr "Error al actualizar el perfil"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Error al actualizar el perfil remoto"
 
@@ -901,33 +1045,36 @@ msgid "Error with confirmation code."
 msgstr "Error con el código de confirmación."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Apodo existente"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "Preguntas Frecuentes"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Error al actualizar avatar."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed de los amigos de %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed de respuestas a %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Feed para tag %s"
@@ -942,7 +1089,7 @@ msgstr "Encontrar el contenido de avisos"
 msgid "Find people on this site"
 msgstr "Encontrar gente en este sitio"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -955,6 +1102,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Nombre completo"
 
@@ -963,23 +1115,33 @@ msgstr "Nombre completo"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Ayuda"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Inicio"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Página de inicio"
 
@@ -987,21 +1149,27 @@ msgstr "Página de inicio"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "La página de inicio no es un URL válido."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Deseo enviar estados por email"
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Dirección de mensajería instantánea"
 
@@ -1011,7 +1179,7 @@ msgid "IM Settings"
 msgstr "Configuración de mensajería instantánea"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1019,7 +1187,7 @@ msgstr ""
 "Si ya tienes una cuenta, ingresa con tu nombre de usuario y contraseña para "
 "conectarla con tu OpenID."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1027,7 +1195,7 @@ msgstr ""
 "Si quieres agregar una cuenta OpenID, ponla en el campo de abajo y haz clic "
 "en \"Añadir\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1038,25 +1206,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Correo entrante"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Dirección de correo entrante removida."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Contraseña antigua incorrecta."
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1065,30 +1239,31 @@ msgstr ""
 "correo registrada."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "El URL del avatar '%s' es inválido"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Dirección de correo electrónico inválida: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "La página de incicio '%s' no es válida"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "El URL de la licencia '%s' es inválido"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "El contenido del aviso es inválido"
 
@@ -1103,13 +1278,13 @@ msgid "Invalid notice url"
 msgstr "El URL del aviso es inválido"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "El URL del perfil '%s' es inválido"
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "El URL del perfil es inválido (formato incorrecto)"
 
@@ -1127,28 +1302,35 @@ msgstr "Tamaño inválido."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Invitacion(es) enviada(s)"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Invitacion(es) enviada(s) a las siguientes personas:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Invitar"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Invitar nuevos usuarios:"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1160,11 +1342,12 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "El Jabber ID ya pertenece a otro usuario."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1175,12 +1358,14 @@ msgstr ""
 "mensajería instantánea o en GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Idioma"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Idioma es muy largo ( max 50 car.)"
 
@@ -1189,7 +1374,15 @@ msgstr "Idioma es muy largo ( max 50 car.)"
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Ubicación"
 
@@ -1198,7 +1391,12 @@ msgstr "Ubicación"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 
@@ -1207,18 +1405,22 @@ msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Inicio de sesión"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Inicio de sesión con una cuenta [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1229,22 +1431,26 @@ msgstr ""
 "(%%action.register%%) una cuenta nueva o prueba [OpenID] (%%action."
 "openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Salir"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "¿Contraseña olvidada o perdida?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Hace una nueva dirección de correo para postear; cancela la anterior."
 
@@ -1255,16 +1461,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestiona la forma en que recibes correo desde %%site.name%%"
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Miembro desde"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog por %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1277,42 +1485,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Mi texto y archivos están disponibles bajo"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Nuevo"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nueva dirección de correo para postear a %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "Nueva dirección de correo entrante agregada."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Nuevo apodo"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Nuevo aviso"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 
@@ -1322,7 +1538,13 @@ msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Apodo"
 
@@ -1331,7 +1553,12 @@ msgstr "Apodo"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "El apodo ya existe. Prueba otro."
 
@@ -1340,49 +1567,60 @@ msgstr "El apodo ya existe. Prueba otro."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "El apodo debe tener solamente letras minúsculas y números y no puede tener "
 "espacios. "
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Apodo prohibido."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Apodo del usuario que quieres seguir"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Apodo o correo electrónico"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "No"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Ningún Jabber ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "¡Ninguna petición de autorización!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "No se seleccionó un operador móvil."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "No ingresó código"
 
@@ -1394,11 +1632,15 @@ msgstr "Ningún código de confirmación."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "¡Ningún contenido!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Sin dirección de correo electrónico"
 
@@ -1407,7 +1649,9 @@ msgid "No id."
 msgstr "Ningún identificador."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "No hay dirección de correo entrante."
 
@@ -1418,6 +1662,7 @@ msgstr "Ningún apodo devuelto por el servidor remoto."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Ningún apodo."
 
@@ -1425,12 +1670,14 @@ msgstr "Ningún apodo."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Ninguna confirmación pendiente para cancelar."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Sin número telefónico"
 
@@ -1440,7 +1687,8 @@ msgid "No profile URL returned by server."
 msgstr "Ningun URL de perfil devuelto por el servidor."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
 
@@ -1452,7 +1700,7 @@ msgstr "¡Ninguna petición encontrada!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Ningún resultado"
 
@@ -1463,12 +1711,16 @@ msgstr "Ningún tamaño."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "No se encontró estado para ese ID"
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "No hay estado para ese ID"
 
@@ -1478,13 +1730,15 @@ msgid "No such OpenID."
 msgstr "No existe esa cuenta OpenID."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "No existe ese documento."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No existe ese aviso."
 
@@ -1522,12 +1776,22 @@ msgstr "No existe esa suscripción"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "No existe ese usuario."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "No hay ningún usuario con esa dirección de correo o nombre de usuario."
 
@@ -1541,32 +1805,38 @@ msgid "Not a recovery code."
 msgstr "No es un código de recuperación."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "No es un usuario registrado"
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "No es un formato de dato soportado"
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no válido"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "La cuenta OpenID no es válida."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "No es una dirección de correo electrónico válida"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Correo electrónico no válido"
 
@@ -1574,6 +1844,11 @@ msgstr "Correo electrónico no válido"
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Apodo no válido"
 
@@ -1593,7 +1868,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "URL de perfil no válido (ningún documento YADIS)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "No es una imagen o es un fichero corrupto."
 
@@ -1604,11 +1880,13 @@ msgstr "No autorizado."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "¡Respuesta inesperada!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "No encontrado"
 
@@ -1624,11 +1902,15 @@ msgstr "No encontrado"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "No conectado."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "¡No estás suscrito!"
 
@@ -1645,39 +1927,44 @@ msgid "Notice feed for %s"
 msgstr "Feed de avisos de %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Aviso sin perfil"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Avisos"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Avisos marcados con %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Antigua contraseña"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "Cuenta OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "Configuración de la Cuenta OpenID"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "Auto-envío de OpenID"
 
@@ -1685,29 +1972,34 @@ msgstr "Auto-envío de OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "Ingreso desde una cuenta OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "URL de la cuenta OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "Autenticación OpenID cancelada."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Autenticación OpenID fallida: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Error OpenID: %s"
@@ -1723,11 +2015,12 @@ msgid "OpenID settings"
 msgstr "Configuración OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcionalmente añada un mensaje personalizado a su invitación."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Carga parcial."
 
@@ -1737,34 +2030,46 @@ msgstr "Carga parcial."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Contraseña"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "La contraseña y la confirmación no coinciden."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Recuperación de contraseña solicitada"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Se guardó Contraseña."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Las contraseñas no coinciden"
 
@@ -1784,14 +2089,17 @@ msgid "People search"
 msgstr "Buscador de gente"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Personal"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Mensaje Personal"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Número telefónico, sin puntuación ni espacios, incluya código de área"
 
@@ -1806,7 +2114,7 @@ msgstr ""
 "\"Cancelar\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Enviar un aviso cuando el estado de mi Jabber/GTalk cambie."
 
@@ -1815,7 +2123,9 @@ msgstr "Enviar un aviso cuando el estado de mi Jabber/GTalk cambie."
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -1824,42 +2134,52 @@ msgstr "Preferencias"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Lenguaje de preferencia"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Privacidad"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Hubo un problema al guardar el aviso."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Perfil"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "URL del perfil"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configuración del perfil"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Perfil desconocido"
 
@@ -1868,17 +2188,19 @@ msgid "Public Stream Feed"
 msgstr "Feed del flujo público"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Línea temporal pública"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar un MicroID para mi dirección de correo."
 
@@ -1888,12 +2210,14 @@ msgid "Recent Tags"
 msgstr "Tags recientes"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Recuperar"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Recuperar contraseña"
 
@@ -1906,37 +2230,45 @@ msgstr "Código de recuperación para usuario desconocido."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrarse"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Registro de usuario no permitido."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Registro exitoso."
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Rechazar"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Recordarme"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Perfil remoto sin perfil coincidente"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Subscripción remota"
 
@@ -1950,6 +2282,9 @@ msgstr "Subscripción remota"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1958,7 +2293,7 @@ msgstr "Eliminar"
 msgid "Remove OpenID"
 msgstr "Eliminar OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1967,34 +2302,41 @@ msgstr ""
 "eliminarlo, agrega otro antes."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Respuestas"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Respuestas a %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Restablecer"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "Número telefónico para sms"
 
@@ -2003,17 +2345,18 @@ msgstr "Número telefónico para sms"
 msgid "SMS Settings"
 msgstr "Preferencias SMS"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "SMS confirmación"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Igual a la contraseña de arriba"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Igual a la contraseña de arriba. Requerida"
 
@@ -2026,12 +2369,21 @@ msgstr "Igual a la contraseña de arriba. Requerida"
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Guardar"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Buscar"
 
@@ -2041,7 +2393,7 @@ msgid "Search Stream Feed"
 msgstr "Feed del flujo de búsqueda"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2050,7 +2402,7 @@ msgstr ""
 "Buscar avisos en %%site.name%% por contenido. Separa los términos de "
 "búsqueda con espacios; deben tener una longitud mínima de 3 caracteres."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2060,33 +2412,38 @@ msgstr ""
 "los términos con espacios; deben tener una longitud mínima de 3 caracteres."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Seleccione un operador móvil"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Enviar"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Envie emails a esta dirección para ingresar nuevos avisos"
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviarme avisos de suscripciones nuevas por correo."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviarme avisos por Jabber/GTalk"
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2095,16 +2452,19 @@ msgstr ""
 "mi operador móvil"
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Envirame respuestas por medio de Jabber/GTalk de gente a la cual no sigo."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Configuración"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Se guardó configuración."
 
@@ -2124,27 +2484,32 @@ msgid "Something weird happened."
 msgstr "Algo raro pasó."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Lo sentimos, pero no se permite correos entrantes"
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Lo sentimos, pero este no es su dirección de correo entrante."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Fuente"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Estadísticas"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "No se ha encontrado el OpenID almacenado."
 
@@ -2152,24 +2517,28 @@ msgstr "No se ha encontrado el OpenID almacenado."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Suscribirse"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Suscriptores"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Suscripción autorizada"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Suscripción rechazada"
 
@@ -2177,28 +2546,35 @@ msgstr "Suscripción rechazada"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Suscripciones"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Error del sistema al cargar el archivo."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Tags"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Texto"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Búsqueda de texto"
 
@@ -2218,6 +2594,7 @@ msgid "That confirmation code is not for you!"
 msgstr "¡Ese código de confirmación no es para ti!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Esa dirección de correo pertenece a otro usuario."
 
@@ -2227,63 +2604,73 @@ msgid "That file is too big."
 msgstr "Ese archivo es demasiado grande."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Ese ya es tu Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Esa ya es tu dirección de correo electrónico"
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Ese ya es tu número telefónico"
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Ese no es tu Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Esa no es tu dirección de correo electrónico"
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Ese no es tu número telefónico"
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Esa dirección de mensajería instantánea es incorrecta."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Ese no es el número de confirmación"
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Ese número telefónico ya pertenece a otro usuario"
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Es demasiado largo. La longitud máxima es de 255 caracteres. "
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "La dirección \"%s\" fue confirmada para tu cuenta."
@@ -2292,11 +2679,14 @@ msgstr "La dirección \"%s\" fue confirmada para tu cuenta."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "La dirección fue eliminada."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2306,7 +2696,8 @@ msgstr ""
 "Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. Tu "
 "identificador de suscripción es:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2317,35 +2708,40 @@ msgstr ""
 "completamente."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Estas son las personas que escuchan los avisos de %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Estas son las personas que escuchan tus avisos."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Estas son las personas que %s escucha sus avisos."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Estas son las personas que escuchas sus avisos."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Estas personas ya son usuarios y fuiste suscripto automáticamente a ellos:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 "Este código de confirmación es demasiado viejo. Por favor empieza de nuevo."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2354,7 +2750,7 @@ msgstr ""
 "clic en el botón de envío para ir a tu proveedor de OpenID."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2369,6 +2765,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Este método requiere un PUBLICAR O ELIMINAR"
 
@@ -2377,25 +2776,37 @@ msgstr "Este método requiere un PUBLICAR O ELIMINAR"
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Este método requiere PUBLICAR"
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Esta página no está disponible en el tipo de medio que aceptas."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Zona horaria"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Zona horaria no seleccionada"
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2408,18 +2819,21 @@ msgstr ""
 "tu perfil debajo."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Deben proveerse dos identificaciones de usuario o nombres en pantalla."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
 
@@ -2431,15 +2845,22 @@ msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Restablecimiento de contraseña inesperado."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Acción desconocida"
 
@@ -2470,38 +2891,47 @@ msgstr "Cancelar suscripción"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Versión OMB no soportada"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Formato de imagen no soportado."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Actualizaciones por sms"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Actualizaciones por mensajería instantánea"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "¡Actualizaciones de %1$s en %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Cargar"
 
@@ -2522,14 +2952,16 @@ msgid "Upload a new profile image"
 msgstr "Cargar una nueva imagen de perfil"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Usa este formulario para invitar a tus amigos y colegas a usar este "
-"servicio."
+"Usa este formulario para invitar a tus amigos y colegas a usar este servicio."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
@@ -2554,11 +2986,16 @@ msgstr "El usuario al que quieres seguir no existe."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "El usuario no tiene un perfil."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Apodo del usuario"
 
@@ -2567,29 +3004,33 @@ msgid "User not found."
 msgstr "Usuario no encontrado"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "En que zona horaria se encuentra normalmente?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo de imagen incorrecto para '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Tamaño de imagen incorrecto para '%s'"
@@ -2597,7 +3038,9 @@ msgstr "Tamaño de imagen incorrecto para '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Sí"
 
@@ -2620,11 +3063,12 @@ msgid "You are already logged in!"
 msgstr "¡Ya te has conectado!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Ya estás suscrito a estos usuarios:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "No eres amigo del usuario especificado."
 
@@ -2640,9 +3084,10 @@ msgstr "Puedes crear una nueva cuenta y empezar a enviar avisos."
 #: actions/smssettings.php:69
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Puedes recibir mensajes SMS por correo electrónico desde %%site.name%%."
+msgstr ""
+"Puedes recibir mensajes SMS por correo electrónico desde %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
@@ -2651,6 +3096,7 @@ msgstr ""
 "\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2659,7 +3105,8 @@ msgstr ""
 "Puedes enviar y recibir avisos vía [mensajes instantáneos](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu dirección y opciones abajo."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2670,21 +3117,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "¡Puedes usar la suscripción local!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "No nos enviaste ese perfil"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2706,16 +3155,19 @@ msgstr ""
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "No puedes borrar el estado de otro usuario."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "Debes estar conectado para invitar otros usuarios a usar %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2723,22 +3175,23 @@ msgstr ""
 "Recibirás un mensaje cuando tus invitados acepten tu invitacion y se "
 "registren en el sitio. ¡Gracias por extender la comunidad! "
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Te has identificado. Escribe una nueva contraseña a continuación."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "El URL de tu OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Tu nombre de usuario en este servidor, o la dirección de correo electrónico "
 "registrada."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2747,47 +3200,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) te permite ingresar a muchos sitios con la misma "
 "cuenta de usuario. Puedes administrar tus OpenID asociados desde aquí."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "hace unos segundos"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "hace %d días"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "hace %d horas"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "hace %d minutos"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "hace %d meses"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "hace un día"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "hace un minuto"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "hace un mes"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "hace un año"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "hace una hora"
 
@@ -2809,12 +3272,14 @@ msgid "reply"
 msgstr "responder"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "repita la contraseña anterior"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "tipo de archivo soportado"
 
@@ -2836,6 +3301,26 @@ msgstr "« Después"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Hubo un problema con tu clave de sesión.  Por favor, intenta nuevamente."
@@ -2845,6 +3330,7 @@ msgid "This notice is not a favorite!"
 msgstr "¡Este aviso no es un favorito!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "No se pudo borrar favorito."
 
@@ -2852,24 +3338,30 @@ msgstr "No se pudo borrar favorito."
 msgid "Favor"
 msgstr "Aceptar"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Enviarme un correo electrónico cuando alguien agrega mi aviso a favoritos."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Enviarme un correo electrónico cuando alguien me envía un mensaje privado."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "¡Este aviso ya está en favoritos!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "No se pudo crear favorito."
 
@@ -2879,11 +3371,13 @@ msgstr "Sacar"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s avisos favoritos"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Feed de avisos favoritos de %s"
@@ -2926,33 +3420,44 @@ msgid "Login with your username and password. "
 msgstr "Entrar con nombre y contraseña de usuario."
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Demasiado largo. Máximo 140 caracteres.  "
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "No se especificó receptor."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "No puedes enviar mensaje a este usuario."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "No existe el usuario."
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nuevo Mensaje "
 
@@ -2990,8 +3495,7 @@ msgstr "Bandeja de salida para %s"
 #: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
-"Ésta es tu bandeja de salida, incluye la lista de mensajes privados "
-"enviados."
+"Ésta es tu bandeja de salida, incluye la lista de mensajes privados enviados."
 
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
@@ -3008,6 +3512,11 @@ msgstr "Puedes actualizar aquí tu información de perfil personal"
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Usuario sin perfil equivalente"
 
@@ -3036,6 +3545,8 @@ msgid "New password successfully saved. "
 msgstr "Se guardo exitosamente la nueva contraseña."
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Cotrnaseña debe tener 6 o más caracteres."
 
@@ -3058,12 +3569,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "Para suscribirse, puedes [login](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Feed para favoritos de %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "No se pudo recibir avisos favoritos."
 
@@ -3071,7 +3585,7 @@ msgstr "No se pudo recibir avisos favoritos."
 msgid "No such message."
 msgstr "No existe el mensaje."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Sólo el remitente y el receptor pueden leer este mensaje."
 
@@ -3095,51 +3609,70 @@ msgid "Mobile carrier for your phone. "
 msgstr "Operador móvil para tu teléfono."
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Mensajes directos a %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Todos los mensajes directos enviados a %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Mensajes directos que has enviado"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Todos los mensajes directos enviados desde %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "¡Sin texto de mensaje!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "No se encuentra usuario receptor."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoritos desde %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s actualizaciones favoritas por %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s agregó tu aviso a favoritos"
@@ -3161,14 +3694,17 @@ msgstr ""
 "Agregar tu cuenta Twitter para enviar automáticamente tus avisos a Twitter, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Configuración de Twitter"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Cuenta Twitter"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Cuenta Twitter actual verificada."
 
@@ -3177,6 +3713,7 @@ msgid "Twitter Username"
 msgstr "Nombre de usuario Twitter"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Sin espacios, por favor."
 
@@ -3185,18 +3722,22 @@ msgid "Twitter Password"
 msgstr "Contraseña Twitter"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Enviar automáticamente mis avisos a Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Enviar respuestas \"@\" locales a Twitter."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Suscribir a mis amigos Twitter aquí."
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3205,6 +3746,7 @@ msgstr ""
 "y subrayadas (_). Máx. 15 caracteres."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "¡No se pudo verificar tus credenciales Twitter!"
 
@@ -3215,33 +3757,43 @@ msgstr "No se pudo obtener tu información de cuenta para \"%s% desde Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "¡No se pudo guardar tu configuración de Twitter!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Se guardó configuración de Twitter."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "No es tu cuenta Twitter."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "No se pudo eliminar usuario Twitter."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Se eliminó cuenta Twitter."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "No se pudo guardar preferencias de Twitter."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Se guardó preferencias de Twitter."
 
@@ -3258,18 +3810,19 @@ msgid "The subscription has been rejected, but no "
 msgstr "Se rechazó la suscripción, pero no"
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Resultados de comando"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Comando completo"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Comando falló"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Disculpa, todavía no se implementa este comando."
 
@@ -3279,89 +3832,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "Suscripciones: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "Usuario no tiene último aviso"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Aviso marcado como favorito."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nombre completo: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Página de inicio: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Se envió mensaje directo a %s"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Error al enviar mensaje directo."
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especificar el nombre del usuario a suscribir"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Suscrito a %s"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especificar el nombre del usuario para desuscribirse de"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Desuscrito de %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Todavía no se implementa comando."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Notificación no activa."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "No se puede desactivar notificación."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Notificación activada."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "No se puede activar notificación."
 
@@ -3369,11 +3944,11 @@ msgstr "No se puede activar notificación."
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "No se pudo insertar mensaje."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "No se pudo actualizar mensaje con nuevo URI."
 
@@ -3390,7 +3965,7 @@ msgstr ""
 "Tienes nueva dirección para publicar en %1$s.\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "Nuevo mensaje privado de %s"
@@ -3404,7 +3979,7 @@ msgstr ""
 "%1$s (%2$s) te envió un mensaje privado:\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "Sólo el usuario puede leer sus bandejas de correo."
 
@@ -3413,31 +3988,39 @@ msgid "This form should automatically submit itself. "
 msgstr "Este formulario debería enviarse automáticamente."
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Favoritos"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Avisos favoritos de %s"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Usuario"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Bandeja de Entrada"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Mensajes entrantes"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Bandeja de Salida"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Mensajes enviados"
 
@@ -3450,14 +4033,19 @@ msgid "Twitter integration options"
 msgstr "Opciones de integración de Twitter"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "Para"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "No se pudo analizar sintácticamente mensaje."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s y amigos, página %d"
@@ -3467,22 +4055,32 @@ msgid "You can upload your personal avatar."
 msgstr "Puedes cargar tu avatar personal."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "Configuración de Avatar"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Vista previa"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Cortar"
 
@@ -3499,36 +4097,45 @@ msgid "There was a problem with your session token. "
 msgstr "Hubo problemas con tu clave de sessión."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Elige un área cuadrada de la imagen para que sea tu avatar"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Se perdió nuestros datos de archivo."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "Se perdió nuestro archivo"
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 #, fuzzy
 msgid "Unknown file type"
 msgstr "tipo de archivo desconocido"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "No se especificó perfil."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "No existe perfil con ese ID"
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "Bloquear usuario."
@@ -3537,12 +4144,12 @@ msgstr "Bloquear usuario."
 msgid "Are you sure you want to block this user? "
 msgstr "¿Seguro de que quieres bloquear este usuario?"
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 #, fuzzy
 msgid "You have already blocked this user."
 msgstr "Ya bloqueaste este usuario."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "No se guardó información de bloqueo."
 
@@ -3560,40 +4167,58 @@ msgstr "¿Estás seguro de que quieres eliminar permanentemente este aviso?"
 msgid "Add to favorites"
 msgstr "Agregar a favoritos"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Editar grupo %s"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr "Se debe habilitar las bandejas de entrada para grupos"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Debes estar conectado para crear un grupo"
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "Ningún apodo."
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "No existe ese grupo"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Debes ser un admin para editar el grupo"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Usa este formulario para editar el grupo."
 
@@ -3603,16 +4228,17 @@ msgid "Nickname must have only lowercase letters "
 msgstr "El apodo sólo debe tener letras en minúscula"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "Descripción es demasiado larga (máx. 140 caracteres)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "No se pudo actualizar el grupo."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 #, fuzzy
 msgid "Options saved."
 msgstr "Se guardó configuración de Opciones."
@@ -3630,7 +4256,8 @@ msgstr "Crear una nueva dirección de correo electrónico para publicar;"
 msgid "Send me email when someone "
 msgstr "Enviarme un correo cuando alguien"
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir que amigos me contacten y envién un correo."
 
@@ -3646,7 +4273,7 @@ msgstr ""
 "Un código de confirmación fue enviado a la dirección de correo electrónico "
 "que agreaste. "
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "¡Error de servidor - no se pudo acceder a usuario!"
 
@@ -3660,55 +4287,70 @@ msgstr "Si quieres que la aplicación %s se actualice automáticamente"
 msgid "Allow %s to update my Facebook status"
 msgstr "Permitir que %s actualice mi estado de Facebook"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Saltar"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "¡Aviso sin contenido!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Paginación"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 #, fuzzy
 msgid "After"
 msgstr "« Después"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "Antes"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Gracias por invitar a tus amigos a usar %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 #, fuzzy
 msgid "Invitations have been sent to the following users:"
 msgstr "Se enviarón invitaciones a los siguientes usuarios: "
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "Te invitaron a %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "Invita a tus amigos a usar %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Amigos que ya usan %s:"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Enviar invitaciones"
@@ -3754,12 +4396,14 @@ msgstr "Si quieres que %s se actualice automáticamente"
 msgid "Sync preferences"
 msgstr "Preferencias de sincronización"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Sacar favorito"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "Avisos populares"
@@ -3775,7 +4419,8 @@ msgid "The most popular notices on the site right now."
 msgstr "Ahora se muestran los avisos más populares en el sitio."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Usuarios que figuran"
 
@@ -3789,15 +4434,17 @@ msgstr "Usuarios que figuran, página %d"
 msgid "A selection of some of the great users on %s"
 msgstr "Una selección de algunos de los grandes usuarios en %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Ese usuario te ha bloqueado la suscripción."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "Sin ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Logo de grupo"
 
@@ -3805,12 +4452,14 @@ msgstr "Logo de grupo"
 msgid "You can upload a logo image for your group."
 msgstr "Puedes cargar una imagen de logo para tu grupo."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "SE actualizó logo."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "Error al actualizar logo."
@@ -3830,7 +4479,8 @@ msgid "A list of the users in this group."
 msgstr "Lista de los usuarios en este grupo."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grupos"
 
@@ -3845,6 +4495,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "Los grupos %%%%site.name%%%% dejan que los encuentres y les hables "
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "Crear un grupo nuevo"
@@ -3855,7 +4506,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr "Buscar grupos en %%site.name%% por nombre, lugar o descripción."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "Buscador de grupos"
@@ -3879,21 +4530,21 @@ msgstr "Enviarme avisos a través de Jabber/GTalk"
 msgid "A confirmation code was sent "
 msgstr "Se envió un código de confirmación."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "Debes estar conectado para unirte a un grupo."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Ya eres miembro de ese grupo"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "No se puede unir usuario %s a grupo %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s se unió a grupo %s"
@@ -3902,16 +4553,19 @@ msgstr "%s se unió a grupo %s"
 msgid "Inboxes must be enabled for groups to work."
 msgstr "Se debe habilitar bandejas de entrada para que funcionen grupos."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Debes estar conectado para dejar un grupo."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "No existe ese grupo."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "No eres miembro de ese grupo"
@@ -3920,22 +4574,26 @@ msgstr "No eres miembro de ese grupo"
 msgid "You may not leave a group while you are its administrator."
 msgstr "No puedes dejar un grupo mientras seas su administrador."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 #, fuzzy
 msgid "Could not find membership record."
 msgstr "No se pudo encontrar registro de miembro"
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "No se pudo eliminar a usuario %s de grupo %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s dejó grupo %s"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "Ingresar a sitio"
 
@@ -3947,16 +4605,18 @@ msgstr "No existe estado actual"
 msgid "New group"
 msgstr "Grupo nuevo "
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "Usa este formulario para crear un grupo nuevo."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "No se pudo crear grupo."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "No se pudo configurar miembros de grupo."
@@ -3970,12 +4630,15 @@ msgstr "Ese demasiado largo."
 msgid "Don't send a message to yourself; "
 msgstr "No te auto envíes un mensaje;"
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 #, fuzzy
 msgid "Notice posted"
 msgstr "Aviso publicado"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Error de Ajax"
 
@@ -3990,13 +4653,12 @@ msgstr ""
 msgid "Nudge sent"
 msgstr "Se envió zumbido"
 
-# ¿zumbido? creo que así lo traduce msn
 #: actions/nudge.php:97
 #, fuzzy
 msgid "Nudge sent!"
 msgstr "¡Zumbido enviado!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "Ingreso de OpenID"
@@ -4024,11 +4686,13 @@ msgstr "Acorte automático de URL"
 msgid "Service"
 msgstr "Servicio"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Servicio de acorte automático a usar."
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Servicio de acorte de URL demasiado largo (máx. 50 caracteres)."
@@ -4038,17 +4702,18 @@ msgstr "Servicio de acorte de URL demasiado largo (máx. 50 caracteres)."
 msgid "Change your password."
 msgstr "Cambia tu contraseña."
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "Cambio de contraseña "
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "No es un tag de personas válido: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Usuarios auto marcados con %s - página %d"
@@ -4058,12 +4723,13 @@ msgstr "Usuarios auto marcados con %s - página %d"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Estos usuarios se han marcado \"%s\""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "Información de perfil "
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "Tags para ti (letras, números, -, ., y _), coma - o espacio - separado"
@@ -4074,21 +4740,26 @@ msgid "Automatically subscribe to whoever "
 msgstr "Suscribirse automáticamente a quien quiera "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Tag no válido: '%s' "
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "No se pudo guardar tags."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "Línea de tiempo pública, página %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "No se pudo acceder a corriente pública."
 
@@ -4098,8 +4769,8 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"Es un %%site.name%%, un servicio [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) "
+"Es un %%site.name%%, un servicio [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) "
 
 #: actions/publictagcloud.php:57
 #, fuzzy
@@ -4111,11 +4782,13 @@ msgstr "Nube de tags pública"
 msgid "These are most popular recent tags on %s "
 msgstr "Éstos son los tags recientes más populares en %s"
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "Nube de tags"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Disculpa, sólo personas invitadas pueden registrarse."
 
@@ -4171,7 +4844,8 @@ msgstr "(Debieras recibir un mensaje por correo"
 msgid "That's a local profile! Login to subscribe."
 msgstr "¡Es un perfil local! Ingresa para suscribirte"
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "Respuestas a %s, página %d"
@@ -4181,53 +4855,74 @@ msgstr "Respuestas a %s, página %d"
 msgid "%s favorite notices, page %d"
 msgstr "%s avisos favoritos, página %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Grupo %s, página %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "Perfil de grupo"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "Nota"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Acciones del grupo"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "Feed de avisos de grupo %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "Miembros"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(Ninguno)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "Todos los miembros"
 
@@ -4244,7 +4939,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr "Sólo el remitente y el receptor"
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, página %d"
@@ -4255,33 +4950,40 @@ msgid "'s profile"
 msgstr "Perfil de"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "Perfil de usuario"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Foto"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 #, fuzzy
 msgid "User actions"
 msgstr "Acciones de usuario"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "Enviar un mensaje directo a este usuario"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Mensaje"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "Todos los suscriptores"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "Todos los grupos"
 
@@ -4291,8 +4993,8 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** tiene una cuenta en %%%%site.name%%%%, un servicio [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) "
+"**%s** tiene una cuenta en %%%%site.name%%%%, un servicio [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) "
 
 #: actions/smssettings.php:128
 #, fuzzy
@@ -4307,9 +5009,10 @@ msgstr "Enviarme avisos por SMS;"
 #: actions/smssettings.php:335
 #, fuzzy
 msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Se envió un código de confirmación al número de teléfono que agregaste."
+msgstr ""
+"Se envió un código de confirmación al número de teléfono que agregaste."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Operador móvil"
@@ -4374,17 +5077,18 @@ msgstr "Estas son las personas cuyos avisos"
 msgid "These are the people whose "
 msgstr "Estas son las personas cuyos"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "Jabber "
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Avisos marcados con %s, página %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "Mensajes marcados \"%s\", el más reciente primero"
@@ -4407,7 +5111,7 @@ msgstr "%s tag"
 msgid "Tag user"
 msgstr "Usuario de tag"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4418,19 +5122,19 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "Hubo problemas con tu clave de sesión."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Sólo puedes marcar a las personas a quienes estás suscrito o que están "
 "suscritas a ti."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "No se pudo guardar tags."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Usar este formulario para agregar tags a tus suscriptores o suscripciones."
@@ -4439,20 +5143,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "No existe ese tag."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "Microblog marcado con %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Falló bloquear usuario."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "Falló desbloquear usuario."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "No se encontró."
@@ -4461,15 +5168,16 @@ msgstr "No se encontró."
 msgid "Add your Twitter account to automatically send "
 msgstr "Agregar tu cuenta Twitter a enviar automáticamente"
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Nombre de usuario de Twitter"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Contraseña de Twitter"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Amigos en Twitter"
 
@@ -4482,159 +5190,168 @@ msgstr "Nombre de usuario sólo debe tener números, "
 msgid "Unable to retrieve account information "
 msgstr "No se pudo acceder a información de cuenta"
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "Error al sacar bloqueo."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "Ningún perfil de Id en solicitud."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "Ningún perfil con ese ID."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Desuscrito"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "Grupos %s"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Grupos %s, página %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Hubo problemas al guardar el aviso.  Usuario desconocido."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
 "minutos."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Tienes prohibido publicar avisos en este sitio."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 #, fuzzy
 msgid "Upload an avatar"
 msgstr "Cargar un avatar."
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Otro"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Otras opciones"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Página sin título"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Navegación de sitio primario"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Perfil personal y línea de tiempo de amigos"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Buscar personas o texto"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Account"
 msgstr "Cuenta"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "Cambia tu correo electrónico, avatar, contraseña, perfil"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Conectarse a IM, SMS, Twitter"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Salir de sitio"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Ingresar a sitio"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "Crear una cuenta"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "Ingresar con OpenID."
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "¡Ayúdame!"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "Aviso de sitio"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "Vistas locales"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "Aviso de página"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Navegación de sitio secundario"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Licencia de software de StatusNet"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "Todo"
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "Licencia."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "Bloquear este usuario."
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Bloquear"
 
@@ -4647,12 +5364,15 @@ msgstr "Sacar este aviso"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "Para usar la Aplicación de Facebook %s debes ingresar"
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "una cuenta nueva. "
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 #, fuzzy
 msgid "Published"
 msgstr "Publicado"
@@ -4674,34 +5394,39 @@ msgstr "Filtrar tags"
 msgid "All"
 msgstr "Todo"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Tag"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Elegir tag para reducir lista"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Ir"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "El URL de página de inicio o blog del grupo or tema"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
 msgstr "Descripción"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "Describir al grupo o tema en 140 caracteres"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4712,21 +5437,21 @@ msgstr ""
 msgid "Group"
 msgstr "Grupo"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "Admin"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Editar propiedades del grupo %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 #, fuzzy
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Agregar o editar el logo de %s"
@@ -4759,12 +5484,12 @@ msgstr "Unirse"
 msgid "Leave"
 msgstr "Dejar"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Ingresar con un nombre de usuario y contraseña."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Registrar una cuenta nueva "
@@ -4787,17 +5512,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s ahora está escuchando "
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "Lugar: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Página de inicio: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4806,7 +5531,7 @@ msgstr ""
 "Bio: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s te mandó un zumbido "
@@ -4821,57 +5546,61 @@ msgstr "%1$s (%2$s) quiere saber qué estás haciendo"
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s recién agregó tu aviso de %2$s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 #, fuzzy
 msgid "From"
 msgstr "Desde"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar un aviso directo"
 
-# ¿zumbido? creo que así lo traduce msn
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "Enviar un aviso"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "Caracteres disponibles"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "en respuesta a..."
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Responder este aviso."
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Borrar este aviso"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Borrar"
 
-# ¿zumbido? creo que así lo traduce msn
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Enviar zumbido a este usuario"
 
-# ¿zumbido? creo que así lo traduce msn
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Zumbido "
 
-# ¿zumbido? creo que así lo traduce msn
 #: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Enviar zumbido a este usuario"
@@ -4881,27 +5610,29 @@ msgstr "Enviar zumbido a este usuario"
 msgid "Tags in %s's notices"
 msgstr "Tags en avisos de %s"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Público"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos de usuario"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Tags recientes"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Destacado"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
@@ -4918,31 +5649,33 @@ msgstr "Encontrar grupos en este sitio"
 msgid "Untitled section"
 msgstr "Sección sin título"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Personas a las que %s está suscrito"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Personas suscritas a %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s es miembro de los grupos"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita a amigos y colegas a unirse a %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "El usuario te ha bloqueado."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "Suscribirse a este usuario"
@@ -4956,11 +5689,12 @@ msgid "Top posters"
 msgstr "Principales posteadores"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 #, fuzzy
 msgid "Unblock this user"
 msgstr "Desbloquear este usuario"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Desbloquear"
 
@@ -4968,22 +5702,2065 @@ msgstr "Desbloquear"
 msgid "Unsubscribe from this user"
 msgstr "Desuscribirse de este usuario"
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed de los amigos de %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed de los amigos de %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed de los amigos de %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s y amigos"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Puedes cargar tu avatar personal."
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar actualizado"
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Estás a punto de eliminar permanentemente un aviso. Si lo hace, no se podrá "
+"deshacer"
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+"Hubo un problema con tu clave de sesión.  Por favor, intenta nuevamente."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+"Enviarme un correo electrónico cuando alguien me envía un mensaje privado."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Puedes cargar una imagen de logo para tu grupo."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Elige un área cuadrada de la imagen para que sea tu avatar"
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Microblog por %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Buscar personas en %%site.name%% por nombre, ubicación o intereses. Separa "
+"los términos con espacios; deben tener una longitud mínima de 3 caracteres."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Error al enviar mensaje directo."
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Busca \"%s\" en la Corriente"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
+"contraseña antes de cambiar tu configuración."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Feed del flujo público"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Feed del flujo público"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Feed del flujo público"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"excepto los siguientes datos privados: contraseña, dirección de correo "
+"electrónico, dirección de mensajería instantánea, número de teléfono."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Crear"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Perfil de grupo"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "Perfil de"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed de avisos de %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed de avisos de %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed de avisos de %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Bandeja de salida para %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Configuración del perfil"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Un código de confirmación fue enviado al número de teléfono que agregaste. "
+"Revisa tu bandeja de entrada (¡y la de spam!) para encontrar el código y las "
+"instrucciones sobre cómo usarlo."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "No existe el usuario."
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Agregar tu cuenta Twitter para enviar automáticamente tus avisos a Twitter, "
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "No se pudo obtener tu información de cuenta para \"%s% desde Twitter."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"Por favor revisa estos detalles para asegurar que deseas suscribirte a los "
+"avisos de este usuario. Si no pediste esta suscripción, haz clic en "
+"\"Cancelar\"."
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Buscar personas o texto"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
+"minutos."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Conectarse a IM, SMS, Twitter"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Zumbido "
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "Para usar la Aplicación de Facebook %s debes ingresar"
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"\t%1$s ahora está escuchando tus avisos en  %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Atentamente,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Buscar"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "No existe ese documento."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Lista de los usuarios en este grupo."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Lista de los usuarios en este grupo."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Perfil de usuario"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s y amigos, página %d"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Lista de los usuarios en este grupo."
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Falló desbloquear usuario."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Código de confirmación"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "No se puede eliminar este aviso."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Tag no válido: '%s' "
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "El apodo ya existe. Prueba otro."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "No se pudo crear favorito."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nuevo aviso"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nuevo aviso"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Apodo no válido"
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "No se especificó perfil."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "El usuario te ha bloqueado."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "No eres miembro de ese grupo"
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Bloquear usuario."
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Debes estar conectado para crear un grupo"
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Grupos"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "No se pudo actualizar el usuario."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "¡No se pudo guardar tu configuración de Twitter!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Preferencias de sincronización guardadas."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Debes ser un admin para editar el grupo"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Admin"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Ningún resultado"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "El usuario te ha bloqueado."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Mensaje"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "No se pudo guardar el perfil."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) te permite ingresar a muchos sitios con la misma "
+"cuenta de usuario. Puedes administrar tus OpenID asociados desde aquí."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Configuración del perfil"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"Es un %%site.name%%, un servicio [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) "
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Si has olvidado o perdido tu contraseña, puedes obtener una nueva enviada a "
+"la dirección de correo electrónico que almacenaste en tu cuenta."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Te has identificado. Escribe una nueva contraseña a continuación."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Recuperación de contraseña solicitada"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Error con el código de confirmación."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Suscribirse a este usuario"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s avisos favoritos, página %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Feed de avisos de grupo %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Feed de avisos de grupo %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Feed de avisos de grupo %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio [micro-"
+"blogging](http://en.wikipedia.org/wiki/Micro-blogging) "
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Admin"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "No es usuario local."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Avisos marcados con %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Feed de avisos de grupo %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"**%s** tiene una cuenta en %%%%site.name%%%%, un servicio [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) "
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s ahora está escuchando "
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed de avisos de %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed de avisos de %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "¡Este aviso ya está en favoritos!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "¡Este aviso no es un favorito!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "No se pudo acceder a corriente pública."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "No se especificó receptor."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "No se pudo encontrar ningún estado."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Actualizaciones en respuesta a %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "¡Actualizaciones de %1$s en %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "Licencia."
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Suscripciones %s"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Configuración del perfil"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "No eres miembro de ese grupo"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Hubo un problema al guardar el aviso."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Mensaje a %1$s en %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Perfil de usuario"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Perfil"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Cargar"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Cambia tu contraseña"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Conectarse"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Buscar"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Inicio de sesión"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Bloquear"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Bloquear usuario."
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Agregar o editar el logo de %s"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "¡Ningún contenido!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Usuario"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Buscar"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "La página de inicio no es un URL válido."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "No existe ese tag."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Mensajes directos a %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Demasiado largo. Máximo 140 caracteres.  "
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "No puede seguir al usuario. Usuario no encontrado"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Descripción es demasiado larga (máx. 140 caracteres)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Ya eres miembro de ese grupo"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "No se puede unir usuario %s a grupo %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "No eres miembro de ese grupo"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "No se pudo eliminar a usuario %s de grupo %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Grupos %s"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s es miembro de los grupos"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Acciones del grupo"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar actualizado"
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Formato de imagen no soportado."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Foto"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Descripción es demasiado larga (máx. 140 caracteres)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "¡Actualizaciones de %1$s en %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "El usuario al que quieres seguir no existe."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "No autorizado."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "No se pudieron convertir las clavesde petición a claves de acceso."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Versión desconocida del protocolo OMB."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "No existe ese aviso."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Se perdió nuestro archivo"
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "¡Actualizaciones de %1$s en %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Esta página no está disponible en un "
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Inicia una sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea]"
+"(%%action.register%%) una cuenta nueva o prueba [OpenID] (%%action."
+"openidlogin%%). "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "¡Actualizaciones de %1$s en %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Todas las actualizaciones que corresponden a la frase a buscar \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Conectarse"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Descríbete y cuenta de tus "
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "URL de perfil no válido (ningún documento YADIS)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "¡Es un perfil local! Ingresa para suscribirte"
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "No se pudo obtener la señal de petición."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed de avisos de %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed de avisos de %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed de avisos de %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Mensaje a %1$s en %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed de los amigos de %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed de los amigos de %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed de los amigos de %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Bandeja de salida para %s"
+
+#: actions/shownotice.php:90
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Crear una nueva cuenta"
+msgid "Notice deleted."
+msgstr "Aviso publicado"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Esta página no está disponible en un "
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed de avisos de %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Por favor revisa estos detalles para asegurar que deseas suscribirte a los "
+"avisos de este usuario. Si no pediste esta suscripción, haz clic en "
+"\"Cancelar\"."
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"Se ha autorizado la suscripción, pero no se ha enviado un URL de retorno. "
+"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. Tu "
+"identificador de suscripción es:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Se ha rechazado la suscripción, pero no se ha enviado un URL de retorno. Lee "
+"de nuevo las instrucciones para saber cómo rechazar la suscripción "
+"completamente."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "No se puede leer el URL del avatar '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Tipo de imagen incorrecto para '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "No se pudo redirigir al servidor: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Licencia de software de StatusNet"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr ""
+"No se pudo actualizar el usuario con la dirección de correo confirmada."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Se envió zumbido"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Responder este aviso."
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Hubo un problema al guardar el aviso."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Ningún código de confirmación."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "No se pudo confirmar el correo electrónico."
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
 
-#~ msgid "Email address"
-#~ msgstr "Dirección de correo electrónico"
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Ingresar a sitio"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Seleccione un operador móvil"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Error al insertar aviso"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Describir al grupo o tema en 140 caracteres"
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "Si olvidaste o perdiste tu contraseña, puedes recibir una nueva en la "
-#~ "dirección de correo electrónico que usaste para registrar tu cuenta."
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Describir al grupo o tema en 140 caracteres"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Nuevo aviso"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s agregó tu aviso a favoritos"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "desde"
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "No se pudo acceder a corriente pública."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Borrar aviso"
diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo
index 7e64ddb00..ee82807b2 100644
--- a/locale/fi/LC_MESSAGES/statusnet.mo
+++ b/locale/fi/LC_MESSAGES/statusnet.mo
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 5a53dd2df..816b13829 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -1,3 +1,9 @@
+# Translation of StatusNet to Finnish
+#
+# Author@translatewiki.net: Crt
+# Author@translatewiki.net: Jaakko
+# Author@translatewiki.net: Nike
+# --
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -5,26 +11,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-02-28 01:41+0000\n"
-"Last-Translator: Antti Salminen <antti.salminen@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:34+0000\n"
+"Language-Team: Finnish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fi\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Hakusyöte haulle \"%s\""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -36,19 +43,20 @@ msgstr ""
 msgid " from "
 msgstr " lähteestä "
 
-# Onko päivitys hyvä sana?
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Vastaukset päivitykseen %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s on kutsunut sinut liittymään palveluun %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -105,6 +113,7 @@ msgstr ""
 "Terveisin, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
@@ -127,26 +136,29 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 "%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Käyttäjän %1$s päivitys %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s julkinen syöte"
@@ -156,34 +168,48 @@ msgstr "%s julkinen syöte"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s ja kaverit"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s julkinen aikajana"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s päivitys"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s aikajana"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s päivitykset kaikilta!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -191,16 +217,18 @@ msgstr ""
 "(Saat pian sähköpostiisi viestin, jonka ohjeita seuraamalla voit vahvistaa "
 "sähköpostiosoitteesi.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%"
+"site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** on mikroblogipalvelu. "
@@ -211,38 +239,41 @@ msgstr ""
 ". Tunnustus osallistujille tulee antaa joko koko nimelle tai "
 "käyttäjätunnukselle."
 
-# näissä ei tueta tällä hetkellä myöskään ääkkösiä
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
 "välilyöntejä"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
 "välilyöntejä. Pakollinen."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 tai useampia merkkejä"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 tai useampia merkkejä äläkä unohda mitä kirjoitit!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 tai useampia merkkejä. Pakollinen."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -252,6 +283,7 @@ msgstr ""
 "antaa osoitteelle %s oikeus lähettää viestejä sinulle."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -286,7 +318,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API-metodia ei löytynyt!"
 
@@ -309,16 +368,23 @@ msgstr "API-metodia ei löytynyt!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "API-metodi on työn alla!"
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Tietoa"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Hyväksy"
 
@@ -329,6 +395,9 @@ msgstr "Hyväksy"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Lisää"
 
@@ -346,27 +415,29 @@ msgstr "Lisää tai poista OpenID:t"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Osoite"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Kutsuttavien kavereiden osoitteet (yksi per rivi)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Kaikki tilaukset"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Kaikki päivitykset käyttäjältä %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Kaikki päivitykset hakuehdolla \"%s\""
@@ -376,52 +447,61 @@ msgstr "Kaikki päivitykset hakuehdolla \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Olet jo kirjautunut sisään."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Tilaat jo!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
 
-# "anna lupa" ehkä parempi
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Valtuuta tilaus"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
 "useampi käyttäjä!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
 "ihmiskäyttäjille)"
 
-# Avatar ei ole laajalti käytössä minun tietääkseni missään suomenkielisessä sivustossa tai ohjelmistossa, "kuva" tai silloin kuin täsmennystä tarvitaan "profiilikuva" tai "käyttäjäkuva" on selkeämpi.
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Kuva"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Kuva päivitetty."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -432,6 +512,7 @@ msgstr ""
 "ystävälistaasi?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -441,7 +522,7 @@ msgstr ""
 "lisäohjeita. "
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
 
@@ -449,10 +530,11 @@ msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
 msgid "Before »"
 msgstr "Aiemmin »"
 
-# Biolle ei oikein suoranaista käännöstä taida suomeksi olla (pl. elämäkerta, joka ei nyt ihan ole 140-merkkistä infokenttää vastaava), tietoja on varmaan kohtuullinen käännös.
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Tietoja"
 
@@ -460,16 +542,18 @@ msgstr "Tietoja"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Tätä päivitystä ei voi poistaa."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
@@ -477,6 +561,8 @@ msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Uutta salasanaa ei voida tallentaa."
 
@@ -484,31 +570,34 @@ msgstr "Uutta salasanaa ei voida tallentaa."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Peruuta"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Ei voitu luoda OpenID Consumer-oliota."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Ei voida normalisoida Jabber ID -tunnusta"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Ei voida normalisoida sähköpostiosoitetta"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Vaihda"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Muuta sähköpostin käsittelyasetuksia."
 
@@ -518,11 +607,12 @@ msgid "Change password"
 msgstr "Vaihda salasana"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Vaihda salasanasi"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Vaihda profiiliasetuksesi"
 
@@ -532,6 +622,9 @@ msgstr "Vaihda profiiliasetuksesi"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Vahvista"
 
@@ -544,12 +637,14 @@ msgstr "Vahvista osoite"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Vahvistus peruttu."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Vahvistuskoodi"
 
@@ -558,7 +653,8 @@ msgstr "Vahvistuskoodi"
 msgid "Confirmation code not found."
 msgstr "Vahvistuskoodia ei löytynyt."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -592,21 +688,24 @@ msgstr ""
 "Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Yhdistä"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Yhdistä olemassa oleva käyttäjätunnus"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Ota yhteyttä"
 
-# on lomake
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Ei voitu luoda OpenID lomaketta: %s"
@@ -614,35 +713,39 @@ msgstr "Ei voitu luoda OpenID lomaketta: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Ei voitu tilata käyttäjää: %s on jo listallasi"
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Ei voitu tilata käyttäjää: Käyttäjää ei löytynyt."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Ei voitu tallentaa profiilikuvan tietoja"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Ei voitu tallentaa uutta profiilitietoa"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Toista ei voitu asettaa tilaamaan sinua."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Ei voitu tilata."
 
@@ -662,15 +765,17 @@ msgstr "Ei voitu muuttaa request tokeneita access tokeneiksi."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Ei voitu poistaa sähköpostivahvistusta."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Ei voitu poistaa tilausta."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Ei löytynyt yhtään päivitystä."
 
@@ -683,29 +788,38 @@ msgstr "Ei saatu request tokenia."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Ei voitu asettaa vahvistuskoodia."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Ei voitu lisätä uutta tilausta."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Ei voitu tallentaa profiilia."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Ei voitu päivittää käyttäjätietoja."
 
@@ -721,45 +835,50 @@ msgstr "Ei voitu päivittää käyttäjätietoja."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Ei voitu päivittää käyttäjää."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Luo"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Luo uusi käyttäjä tällä käyttäjätunnuksella."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Luo uusi käyttäjätili"
 
-# Koodista selviää, että tämä on virhetilanne jossa on yritetty luoda tuollaista.
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 "Yritettiin luoda uusi käyttäjätili OpenID tunnukselle, jolla on jo "
 "käyttäjätili."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Tämän hetken vahvistettu Jabber/GTalk -osoite."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Tämän hetken vahvistettu SMS puhelinnumero."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 
@@ -768,23 +887,27 @@ msgid "Currently"
 msgstr "Tällä hetkellä"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Poista päivitys"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Kuvaile itseäsi ja kiinnostuksiasi 140 merkillä"
 
@@ -792,11 +915,13 @@ msgstr "Kuvaile itseäsi ja kiinnostuksiasi 140 merkillä"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Sähköposti"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
@@ -806,39 +931,43 @@ msgid "Email Settings"
 msgstr "Sähköpostiasetukset"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Sähköpostiosoite on jo käytössä."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Sähköpostiosoitteen vahvistus"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Sähköpostiosoite, esimerkiksi \"käyttäjätunnus@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Sähköpostiosoitteet"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Syötä käyttäjätunnus tai sähköpostiosoite"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Syötä koodi jonka sait puhelimeesi."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Virhe tapahtui tokenin hyväksynnässä."
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Virhe tapahtui käyttäjän ja OpenID-tunnuksen yhdistämisessä."
 
@@ -849,39 +978,46 @@ msgstr "Virhe tapahtui käyttäjän yhdistämisessä."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Virhe tapahtui profiilikuvan lisäämisessä"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Virhe tapahtui uuden profiilin lisäämisessä"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Virhe tapahtui uuden etäprofiilin lisäämisessä"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Virhe tapahtui osoitevahvistuksen tallentamisessa"
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Virhe tapahtui etäprofiilin tallentamisessa"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Virhe tapahtui profiilin tallentamisessa."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Virhe tapahtui käyttäjän tallentamisessa."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 
@@ -890,6 +1026,9 @@ msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
@@ -900,6 +1039,7 @@ msgstr "Virhe tapahtui profiilin päivittämisessä"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
 
@@ -908,38 +1048,37 @@ msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
 msgid "Error with confirmation code."
 msgstr "Virhe vahvistuskoodin kanssa."
 
-# openid-tunnuksen liittämisessä omaan olemassaolevaan tunnukseen.
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Käytetty tunnus"
 
-# Ei tämäkään kauheasti kerro, mutta ehkä silti englanninkielisiin sivustoihin tutustumattomalle edes lievästi selkeämpi.
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "UKK"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Profiilikuvan päivittäminen epäonnistui."
 
-# Tämä on otsikko käyttäjän Personal-sivun feedille jossa näkyy käyttäjän ja tämän tilausten päivitykset.
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Syöte käyttäjän %s kavereille"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Syöte käyttäjän %s saamista vastauksista"
 
-# tägille vai tagille?
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Syöte tägille %s"
@@ -954,7 +1093,7 @@ msgstr "Hae päivityksien sisällöstä"
 msgid "Find people on this site"
 msgstr "Hae ihmisiä tältä sivustolta"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -967,6 +1106,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Koko nimi"
 
@@ -975,24 +1119,33 @@ msgstr "Koko nimi"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Ohjeet"
 
-# Tämä teksti tulee linkkiin, joka vie käyttäjän omalle sivulle.
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Koti"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Kotisivu"
 
@@ -1000,22 +1153,27 @@ msgstr "Kotisivu"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Haluan lähettää päivityksiä sähköpostilla."
 
-# IM ei ole suomessa käytössä ollenkaan, pikaviestimistä puhutaan ainakin jossain... surullista kyllä ainoa suosittu termi olisi varmaan joku "mese", mutta se ei taida sentään olla yleistynyt tarkoittamaan muuta kuin MS:n tuotetta.
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "Pikaviestin"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Pikaviestiosoite"
 
@@ -1025,7 +1183,7 @@ msgid "IM Settings"
 msgstr "Pikaviestiasetukset"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1033,7 +1191,7 @@ msgstr ""
 "Jos sinulla on jo käyttäjätunnus, kirjaudu sisään käyttäjätunnuksella ja "
 "salasanalla yhdistääksesi OpenID-tunnuksesi siihen."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1041,7 +1199,7 @@ msgstr ""
 "Jos haluat lisätä OpenID-tunnuksen käyttäjätunnukseesi, syötä se alla "
 "olevaan laatikkoon ja paina \"Lisää\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1049,29 +1207,34 @@ msgstr ""
 "Jos olet unohtanut tai hukannut salasanasi, voit saada uuden sähköpostiisi, "
 "jonka olet tallettanut  käyttäjätunnuksellesi."
 
-# Saapuva on ehkä vakiintuneempi sana kun sitä näkee kaikissa sp-ohjelmissa
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Saapuva sähköposti"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Saapuvan sähköpostin osoite poistettu."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Väärä vanha salasana"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1080,35 +1243,34 @@ msgstr ""
 "joka on rekisteröity käyttäjätunnuksellesi."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Kuvan URL-verkkosoite '%s' ei kelpaa"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Sähköpostiosoite %s ei kelpaa"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Kotisivun osoite '%s' ei kelpaa"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Lisenssin verkko-osoite '%s' ei kelpaa"
 
-# status päivitys, päivitys, tätä ei ole vielä päätetty
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Päivityksen sisältö ei kelpaa"
 
-# URL ja URI ilmeisesti OMB:ssä eri asiat.
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
 #: actions/postnotice.php:72
 msgid "Invalid notice uri"
@@ -1120,13 +1282,13 @@ msgid "Invalid notice url"
 msgstr "Päivityksen URL ei kelpaa"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Profiilin URL-osoite '%s' ei kelpaa."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
 
@@ -1144,28 +1306,35 @@ msgstr "Koko ei kelpaa."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Käyttäjätunnus tai salasana ei kelpaa."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Kutsu(t) lähetettiin"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Kutsu(t) lähetettiin seuraaville henkilöille:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Kutsu"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Kutsu uusia käyttäjiä"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1173,15 +1342,16 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 "Sivusto käyttää [StatusNet](http://status.net/) mikroblogausohjelmistoa, "
-"versio %s, saatavilla lisenssillä [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://"
+"www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID kuuluu jo toiselle käyttäjälle."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1192,13 +1362,14 @@ msgstr ""
 "GTalkissa."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Kieli"
 
-# heh
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Kieli on liian pitkä (max 50 merkkiä)."
 
@@ -1207,7 +1378,15 @@ msgstr "Kieli on liian pitkä (max 50 merkkiä)."
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Kotipaikka"
 
@@ -1216,7 +1395,12 @@ msgstr "Kotipaikka"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 
@@ -1225,18 +1409,22 @@ msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Kirjaudu sisään [OpenID](%%doc.openid%%)-tunnuksella"
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1247,22 +1435,26 @@ msgstr ""
 "käyttäjätunnusta? [Rekisteröi](%%action.register%%) käyttäjätunnus tai "
 "kokeile [OpenID](%%action.openidlogin%%)-tunnuksella sisään kirjautumista. "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Pitempi nimi, mieluiten oikea nimesi"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Oletko hukannut tai unohtanut salasanasi?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Tee uusi sähköpostiosoite johon lähettää päivityksiä; tämä poistaa vanhan "
@@ -1275,16 +1467,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Määritä miten saat sähköpostin palvelusta %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Käyttäjänä alkaen"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Käyttäjän %s mikroblogi"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1297,6 +1491,8 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr ""
 "Minun tekstini ja tiedostoni ovat käytettävissä seuraavan lisenssin "
@@ -1305,48 +1501,59 @@ msgstr ""
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Uusi"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "Uusi saapuvan sähköpostin osoite lisätty."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Uusi käyttäjätunnus"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Uusi päivitys"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
 
-# samaa stringiä käytetään sekä ryhmän nimessä, että käyttäjätunnuksessa ->"tunnus"
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151 actions/login.php:101
 #: actions/profilesettings.php:74 actions/register.php:165
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Tunnus"
 
@@ -1355,7 +1562,12 @@ msgstr "Tunnus"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 
@@ -1364,49 +1576,60 @@ msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
 "välilyöntiä."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Käyttäjätunnus ei ole sallittu."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Käyttäjän, jota haluat seurata, käyttäjätunnus"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Käyttäjätunnus tai sähköposti"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "Ei"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Ei Jabber ID -osoitetta"
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Ei valtuutuspyyntöä!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Operaattoria ei ole valittu."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Koodia ei ole syötetty."
 
@@ -1418,11 +1641,15 @@ msgstr "Varmistuskoodia ei ole annettu."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Ei sisältöä!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Sähköpostiosoitetta ei ole."
 
@@ -1431,7 +1658,9 @@ msgid "No id."
 msgstr "Id puuttuu."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "Saapuvan sähköpostin osoitetta ei ole."
 
@@ -1442,6 +1671,7 @@ msgstr "Käyttäjätunnusta ei saatu etäpalvelimelta."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Tunnusta ei ole."
 
@@ -1449,12 +1679,14 @@ msgstr "Tunnusta ei ole."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Puhelinnumeroa ei ole."
 
@@ -1464,7 +1696,8 @@ msgid "No profile URL returned by server."
 msgstr "Profiilin verkko-osoitetta ei saatu palvelimelta."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Rekisteröityä sähköpostiosoitetta ei ole tälle käyttäjälle."
 
@@ -1476,7 +1709,7 @@ msgstr "Kyselyä ei löytynyt!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Ei hakutuloksia"
 
@@ -1487,12 +1720,16 @@ msgstr "Kokoa ei ole."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
 
@@ -1502,13 +1739,15 @@ msgid "No such OpenID."
 msgstr "Annettua OpenID-tunnusta ei ole."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Dokumenttia ei ole."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Päivitystä ei ole."
 
@@ -1546,12 +1785,22 @@ msgstr "Tilausta ei ole."
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Käyttäjää ei ole."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "Käyttäjää tuolla sähköpostilla tai käyttäjätunnuksella ei ole."
 
@@ -1565,32 +1814,38 @@ msgid "Not a recovery code."
 msgstr "Tuo ei ole palautuskoodi."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Tuo ei ole rekisteröitynyt käyttäjä."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Tuo ei ole tuettu tietomuoto."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Tuo ei ole kelvollinen Jabber ID."
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Tuo ei ole kelvollinen OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Tuo ei ole kelvollinen sähköpostiosoite"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 
@@ -1598,6 +1853,11 @@ msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Tuo ei ole kelvollinen tunnus."
 
@@ -1620,7 +1880,8 @@ msgstr ""
 "löytynyt)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Tuo ei ole kelvollinen kuva tai tiedosto on rikkoutunut."
 
@@ -1631,11 +1892,13 @@ msgstr "Ei valtuutusta."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Odottamaton vastaus saatu!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Ei löytynyt"
 
@@ -1651,15 +1914,18 @@ msgstr "Ei löytynyt"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Et ole kirjautunut sisään."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Ei ole tilattu!."
 
-# Vaihtoehtoja noticelle löytyy: päivitys, nootti, status, viesti, päivitys, tilapäivitys, mikropostaus, tilaviesti, status
 #: ../actions/opensearch.php:35 actions/opensearch.php:35
 #: actions/opensearch.php:67
 msgid "Notice Search"
@@ -1673,41 +1939,44 @@ msgid "Notice feed for %s"
 msgstr "Päivityksien syöte käyttäjälle %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Päivitykselle ei ole profiilia"
 
-# Notice suomennos vielä hakusessa
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Päivitykset"
 
-# tagi, tägätty, tagätty, tagatty, tagitetty,
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Päivitykset joilla on tagi %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Vanha salasana"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "OpenID-tunnuksen asetukset"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "OpenID automaattilähetys"
 
@@ -1715,29 +1984,34 @@ msgstr "OpenID automaattilähetys"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "OpenID-sisäänkirjautuminen"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID-osoite"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "OpenID tunnistautuminen peruttiin."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID tunnistautuminen epäonnistui: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID virhe: %s"
@@ -1753,11 +2027,12 @@ msgid "OpenID settings"
 msgstr "OpenID asetukset"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Voit myös lisätä oman viestisi kutsuun"
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Osittain ladattu palvelimelle."
 
@@ -1767,34 +2042,46 @@ msgstr "Osittain ladattu palvelimelle."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Salasana"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Salasana ja salasanan vahvistus eivät täsmää."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Salasanan palautuspyyntö lähetetty."
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Salasana tallennettu."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Salasanat eivät täsmää."
 
@@ -1813,16 +2100,18 @@ msgstr "Etsi ihmisiä"
 msgid "People search"
 msgstr "Etsi ihmisiä"
 
-# Tämä on otsikko käyttäjän sivun välilehdelle, jossa näkyy omat ja tilausten viestit. Omat on ehkä paremmin kuvaava, kuin henkilökohtainen. Saa kyllä muutakin ehdottaa.
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Omat"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Henkilökohtainen viesti"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Puhelinnumero, ei välimerkkejä tai välilyöntejä, suuntanumerollinen"
 
@@ -1837,7 +2126,7 @@ msgstr ""
 "paina \"Peruuta\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Lähetä päivitys kun Jabber/GTalk -tilatietoni vaihtuu."
 
@@ -1846,7 +2135,9 @@ msgstr "Lähetä päivitys kun Jabber/GTalk -tilatietoni vaihtuu."
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -1855,42 +2146,52 @@ msgstr "Asetukset"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Asetukset tallennettu."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Ensisijainen kieli"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Yksityisyys"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Ongelma päivityksen tallentamisessa."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profiili"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profiiliasetukset"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Tuntematon profiili."
 
@@ -1898,36 +2199,37 @@ msgstr "Tuntematon profiili."
 msgid "Public Stream Feed"
 msgstr "Julkinen syöte"
 
-# Suorakäännös voisi sopia. Tähän voisi jotain suomenkielistä termiä hakea tai ottaa tuollainen vähän erikoisempi suora käännös.
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Julkinen aikajana"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Julkaise MicroID sähköpostiosoitteelleni."
 
-# Tagi, tägi,...
 #: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
 msgid "Recent Tags"
 msgstr "Tuoreet tagit"
 
-# Palautuslomakkeen toimintonappi
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Palauta"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Salasanan palautus"
 
@@ -1940,37 +2242,45 @@ msgstr "Tuntemattoman käyttäjän palautuskoodi"
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Rekisteröidy"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Rekisteröityminen ei ole sallittu."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Rekisteröityminen onnistui"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Hylkää"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Muista minut"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Etäprofiilille ei löytynyt vastaavaa profiilia"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Etätilaus"
 
@@ -1984,6 +2294,9 @@ msgstr "Etätilaus"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Poista"
 
@@ -1992,7 +2305,7 @@ msgstr "Poista"
 msgid "Remove OpenID"
 msgstr "Poista OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -2001,36 +2314,41 @@ msgstr ""
 "palveluun. Jos haluat poistaa sen, lisää ensin uusi OpenID-tunnus."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Vastaukset"
 
-# Kai tuo on tiettyyn päivitykseen liittyvät vastaukset.
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Vastaukset käyttäjälle %s"
 
-# Palauta, aseta uudelleen, uudelleenasetus, nollaus, tyhjää
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Vaihda"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Vaihda salasana"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "SMS puhelinnumero"
 
@@ -2039,17 +2357,18 @@ msgstr "SMS puhelinnumero"
 msgid "SMS Settings"
 msgstr "SMS-asetukset"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "SMS vahvistus"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Sama kuin ylläoleva salasana"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Sama kuin ylläoleva salasana. Pakollinen."
 
@@ -2062,12 +2381,21 @@ msgstr "Sama kuin ylläoleva salasana. Pakollinen."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Tallenna"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Haku"
 
@@ -2077,7 +2405,7 @@ msgid "Search Stream Feed"
 msgstr "Hakusyöte"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2086,7 +2414,7 @@ msgstr ""
 "Hae päivityksiä palvelun %%site.name%% sisällöistä. Erota hakutermit "
 "välilyönnillä; hakutermien pitää olla 3 tai useamman merkin pituisia."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2097,33 +2425,38 @@ msgstr ""
 "olla 3 tai useamman merkin pituisia."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Valitse operaattori"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Lähetä"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Lähetä sähköpostia tähän osoitteeseen tehdäksesi päivityksiä."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Lähetä sähköpostilla tieto uusista tilaajista."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Lähetä minulle päivityksiä Jabberilla/GTalkilla."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2132,17 +2465,20 @@ msgstr ""
 "tästä matkapuhelinoperaattoriltani."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Lähetä Jabberilla/GTalkilla sellaistenkin ihmisten vastaukset, joita en ole "
 "tilannut. "
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Asetukset"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Asetukset tallennettu."
 
@@ -2162,27 +2498,32 @@ msgid "Something weird happened."
 msgstr "Jotain erikoista tapahtui."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Lähdekoodi"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Tilastot"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Tallennettua OpenID-tunnusta ei löytynyt."
 
@@ -2190,24 +2531,28 @@ msgstr "Tallennettua OpenID-tunnusta ei löytynyt."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Tilaa"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Tilaajat"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Tilaus sallittu"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Tilaus hylätty"
 
@@ -2215,28 +2560,35 @@ msgstr "Tilaus hylätty"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Tilaukset"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Tagit"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Teksti"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Tekstihaku"
 
@@ -2256,6 +2608,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Tämä vahvistuskoodi ei ole sinun!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Tämä sähköpostiosoite kuuluu jo toisella käyttäjällä."
 
@@ -2265,63 +2618,73 @@ msgid "That file is too big."
 msgstr "Tämä tiedosto on liian iso."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Tämä on jo Jabber ID -tunnuksesi."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Tämä on jo sähköpostiosoitteesi."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Tämä on jo puhelinnumerosi."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Tämä ei ole Jabber ID-tunnuksesi."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Tämä ei ole sähköpostiosoitteesi."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Tämä ei ole puhelinnumerosi."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Tämä on väärä pikaviestiosoite."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Tämä on väärä vahvistukoodi."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Tämä puhelinnumero kuuluu jo toiselle käyttäjälle."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Päivitys on liian pitkä. Maksimipituus on 140 merkkiä."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Päivitys on liian pitkä. Maksimipituus on 255 merkkiä."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Osoite \"%s\" on vahvistettu sinun käyttäjätunnuksellesi."
@@ -2330,12 +2693,14 @@ msgstr "Osoite \"%s\" on vahvistettu sinun käyttäjätunnuksellesi."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "Osoite on poistettu."
 
-# Ilmeisesti jotain etäprofiilin tilausvirheitä nämä on. Laitoin callbackin tuohon ettei huku tietoa virheestä...
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2345,8 +2710,8 @@ msgstr ""
 "saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hyväksytään. "
 "Tilauskoodisi on:"
 
-# Etäprofiilin tilausjuttua.
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2356,35 +2721,40 @@ msgstr ""
 "saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hylätään kokonaan."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Nämä ihmiset seuraavat käyttäjän %s päivityksiä."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Nämä ihmiset seuraavat sinun päivityksiäsi."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Käyttäjä %s seuraa näiden ihmisten päivityksiä."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Näiden ihmisten päivityksiä sinä seuraat."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Nämä ihmiset ovat jo käyttäjiä ja sinä olet automaattisesti tilannut heidän "
 "päivityksensä:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Vahvistuskoodi on liian vanha. Aloita uudelleen."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2393,7 +2763,7 @@ msgstr ""
 "tapahdu, paina lähetä painiketta mennäksesi OpenID-palveluntajoajalle."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2402,41 +2772,55 @@ msgid ""
 msgstr ""
 "Tämä on ensimmäinen kerta kun olet sisäänkirjautunut %s -palveluun, joten "
 "OpenID-tunnuksesi pitää yhdistää johonkin tämän palvelun käyttäjätunnukseen. "
-"Tätä varten voit luoda uuden käyttäjätunnuksen tai yhdistää OpenID-"
-"tunnuksen olemassa olevaan käyttäjätunnukseen, jos sinulla sellainen jo on."
+"Tätä varten voit luoda uuden käyttäjätunnuksen tai yhdistää OpenID-tunnuksen "
+"olemassa olevaan käyttäjätunnukseen, jos sinulla sellainen jo on."
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman."
 
-# sanoma?
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
 #: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Tämä metodi edellyttää POST sanoman."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Aikavyöhykettä ei ole valittu."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2445,23 +2829,25 @@ msgid ""
 msgstr ""
 "Tilataksesi päivitykset, voit [kirjautua sisään](%%action.login%%), tai "
 "[rekisteröidä](%%action.register%%) uuden  käyttäjätunnuksen. Jos sinulla on "
-"jo käyttäjätunnus  jossain [yhteensopivassa "
-"mikroblogauspalvelussa](%%doc.openmublog%%),  syötä profiilisi URL-osoite "
-"alla olevaan kenttään."
+"jo käyttäjätunnus  jossain [yhteensopivassa mikroblogauspalvelussa](%%doc."
+"openmublog%%),  syötä profiilisi URL-osoite alla olevaan kenttään."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Kaksi käyttäjätunnusta tai nimeä täytyy antaa."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
 
@@ -2473,15 +2859,22 @@ msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Odottamaton lomakkeen lähetys."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Odottamaton salasanan uudelleenasetus."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Tuntematon toiminto"
 
@@ -2498,7 +2891,6 @@ msgstr ""
 "Ellei toisin ilmoitettu, tämän palvelun sisältöjen tekijänoikeudet kuuluvat "
 "niiden kirjoittajille ja ovat saatavilla seuraavalla lisenssillä "
 
-# formaatti/tyyppi
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #: actions/confirmaddress.php:90
 #, php-format
@@ -2513,39 +2905,47 @@ msgstr "Peruuta tilaus"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "OMB versiota ei ole tuettu"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Kuvatiedoston formaattia ei ole tuettu."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Päivitykset SMS:llä"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Päivitykset pikaviestintä käyttäen (IM)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
-# tai lähetä
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Lataa"
 
@@ -2567,6 +2967,7 @@ msgid "Upload a new profile image"
 msgstr "Lataa uusi profiilikuva"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -2574,7 +2975,9 @@ msgstr ""
 "tätä palvelua."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja "
@@ -2600,11 +3003,16 @@ msgstr "Käyttäjää jota seurataan ei ole olemassa."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Käyttäjällä ei ole profiilia."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Käyttäjätunnus"
 
@@ -2613,30 +3021,33 @@ msgid "User not found."
 msgstr "Käyttäjää ei löytynyt."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "Missä aikavyöhykkeessä olet normaalisti?"
 
-# Suora FB kopio.
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Mitä teet juuri nyt, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Kuvan '%s' tyyppi on väärä"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Kuvan  '%s' koko on väärä"
@@ -2644,7 +3055,9 @@ msgstr "Kuvan  '%s' koko on väärä"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Kyllä"
 
@@ -2667,11 +3080,12 @@ msgid "You are already logged in!"
 msgstr "Olet jo kirjautunut sisään!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Olet jos tilannut seuraavien käyttäjien päivitykset:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "Et ole määritellyn käyttäjän kaveri."
 
@@ -2690,23 +3104,24 @@ msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Voit saada SMS viestit sähköpostin välityksellä %%site.name%% -palvelusta."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "Voit poistaa OpenID-tunnuksen painamalla \"Poista\"-nappia."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"Voit lähettää ja vastaanottaa päivityksiä "
-"Jabber/GTalk-[pikaviestintä](%%doc.im%%) käyttäen. Alla voit määrittää "
-"osoitteesi ja asetuksesi. "
+"Voit lähettää ja vastaanottaa päivityksiä Jabber/GTalk-[pikaviestintä](%%doc."
+"im%%) käyttäen. Alla voit määrittää osoitteesi ja asetuksesi. "
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2717,21 +3132,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Voit käyttää paikallista tilausta!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Et lähettänyt profiilia"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2753,11 +3170,13 @@ msgstr ""
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Et voi poistaa toisen käyttäjän päivitystä."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
@@ -2765,6 +3184,7 @@ msgstr ""
 "%s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2772,21 +3192,22 @@ msgstr ""
 "Lähetämme sinulle ilmoituksen, kun joku kutsumistasi henkilöistä hyväksyy "
 "kutsun ja rekisteröityy palveluun. Kiitoksia yhteisön kasvattamisesta!"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Sinut on tunnistettu. Syötä  uusi salasana alle. "
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "OpenID URL-osoitteesi"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Käyttäjätunnuksesi tässä palvelussa tai rekisteröity sähköpostiosoitteesi."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2795,47 +3216,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) mahdollistaa kirjautumisen sisään useaan palveluun "
 "yhdellä tunnuksella. Voit hallinnoida OpenID-tunnuksiasi täällä."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "muutama sekunti sitten"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "noin %d päivää sitten"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "noin %d tuntia sitten"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "noin %d minuuttia sitten"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "noin %d kuukautta sitten"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "noin päivä sitten"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "noin minuutti sitten"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "noin kuukausi sitten"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "noin vuosi sitten"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "noin tunti sitten"
 
@@ -2857,12 +3288,14 @@ msgid "reply"
 msgstr "vastaus"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "sama salasana kuin yllä"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "tiedoston tyyppi ei ole tuettu"
 
@@ -2883,6 +3316,26 @@ msgstr "« Myöhemmin"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
@@ -2893,6 +3346,7 @@ msgid "This notice is not a favorite!"
 msgstr "Tämä päivitys ei ole suosikki!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Ei voitu poistaa suosikkia."
 
@@ -2900,22 +3354,28 @@ msgstr "Ei voitu poistaa suosikkia."
 msgid "Favor"
 msgstr "Lisää suosikiksi"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Lähetä sähköpostia, jos joku lähettää minulle yksityisviestin."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Tämä päivitys on jo suosikki!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Ei voitu lisätä suosikiksi."
 
@@ -2925,11 +3385,13 @@ msgstr "Poista suosikeista"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "Käyttäjän %s suosikkipäivitykset"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Käyttäjän %s suosikkipäivityksien syöte"
@@ -2971,33 +3433,44 @@ msgid "Login with your username and password. "
 msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on 140 merkkiä."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Vastaanottajaa ei ole määritelty."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Et voi lähettää viestiä tälle käyttäjälle."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "Tuota käyttäjää ei ole."
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Uusi viesti"
 
@@ -3015,7 +3488,6 @@ msgstr ""
 msgid "If you want to add an OpenID to your account, "
 msgstr "Jos haluat lisätä OpenID-tunnuksen käyttäjätiliisi, "
 
-# pitäisi olla ehkä et voi OpenID:llä kirjautua sisään.
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
@@ -3039,7 +3511,6 @@ msgstr "Käyttäjän %s lähetetyt viestit"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit."
 
-# olikos se näin aiemminkin
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -3057,6 +3528,11 @@ msgstr "Voit päivittää täällä henkilökohtaista profiiliasi "
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Käyttäjälle ei löydy profiilia"
 
@@ -3085,6 +3561,8 @@ msgid "New password successfully saved. "
 msgstr "Uuden salasanan tallennus onnistui. "
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
@@ -3107,13 +3585,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "Tilataksesi päivitykset, voit [kirjautua sisään](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Käyttäjän %s suosikkien syöte"
 
-# suosikkipäivitystä?
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Ei saatu haettua suosikkipäivityksiä."
 
@@ -3121,7 +3601,7 @@ msgstr "Ei saatu haettua suosikkipäivityksiä."
 msgid "No such message."
 msgstr "Tuota viestiä ei ole."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Vain lähettäjä ja vastaanottaja voivat lukea tämän viestin."
 
@@ -3130,7 +3610,6 @@ msgstr "Vain lähettäjä ja vastaanottaja voivat lukea tämän viestin."
 msgid "Message to %1$s on %2$s"
 msgstr "Viesti käyttäjälle %1$s, %2$s"
 
-# Ei välttämättä kovin hyvä tuo päiväysosa.
 #: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
@@ -3146,54 +3625,71 @@ msgid "Mobile carrier for your phone. "
 msgstr "Matkapuhelinoperaattorisi"
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Suorat viestit käyttäjälle %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Kaikki suorat viestit käyttäjälle %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Suorat viestit, jotka sinä olet lähettänyt"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Kaikki suorat viestit käytäjältä %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Viestissä ei ole tekstiä!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Vastaanottajaa ei löytynyt."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
-"Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä "
-"kaveri."
+"Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Käyttäjän %s suosikit"
 
-# ensimmäinen on sivuston/palvelun nimi sorsasta päätellen.
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s lisäsi päivityksesi suosikkeihinsa"
@@ -3216,14 +3712,17 @@ msgstr ""
 "myös Twitteriin, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Twitter-asetukset"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Twitter käyttäjätili"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Tämänhetkinen vahvistettu Twitter käyttäjätilisi."
 
@@ -3232,6 +3731,7 @@ msgid "Twitter Username"
 msgstr "Twitter-käyttäjätunnus"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Ei välilyöntejä, kiitos."
 
@@ -3240,18 +3740,22 @@ msgid "Twitter Password"
 msgstr "Twitter-salasana"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Lähetä päivitykseni automaattisesti Twitteriin."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Lähetä paikalliset \"@\"-vastaukset Twitteriin."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Tilaa kavereitteni Twitter päivitykset täällä."
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3260,6 +3764,7 @@ msgstr ""
 "alaviiva (_). 15 merkkiä maksimissaan."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "Twitter-tunnustasi ei voitu vahvistaa!"
 
@@ -3270,33 +3775,43 @@ msgstr "Ei pystytty hakemaan käyttäjän \"%s\" tietoja Twitteristä."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "Twitter-asetuksia ei voitu tallentaa!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Twitter-asetukset tallennettu."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Tämä ei ole sinun Twitter käyttäjätilisi."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "Twitter käyttäjää ei onnistuttu poistamaan."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Twitter käyttäjätili poistettu."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "Twitter-asetuksia ei voitu tallentaa."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Twitter-asetukset tallennettu."
 
@@ -3304,29 +3819,28 @@ msgstr "Twitter-asetukset tallennettu."
 msgid "Please check these details to make sure "
 msgstr "Tarkista näistä tiedoista haluatko "
 
-# koodissa jatkuu "but no callback url was passed"...
 #: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
 msgstr "Tilausta ei ole hyväksytty, mutta"
 
-# koodissa jatkuu "but no callback url was passed"
 #: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr "Tilaus on hylätty, mutta "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Komennon tulos"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Komento suoritettu"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Komento epäonnistui"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Valitettavasti tätä komentoa  ei ole vielä toteutettu."
 
@@ -3336,89 +3850,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "Tilaukset: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "Käyttäjällä ei ole viimeistä päivitystä"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Päivitys on merkitty suosikiksi."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Koko nimi: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Kotipaikka: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Kotisivu: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Tietoa: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Suora viesti käyttäjälle %s lähetetty"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Tapahtui virhe suoran viestin lähetyksessä."
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Käyttäjän %s päivitykset tilattu"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Komentoa ei ole vielä toteutettu."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Ilmoitukset pois päältä."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "Ilmoituksia ei voi pistää pois päältä."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Ilmoitukset päällä."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Ilmoituksia ei voi pistää päälle."
 
@@ -3426,11 +3962,11 @@ msgstr "Ilmoituksia ei voi pistää päälle."
 msgid "Commands:\n"
 msgstr "Komennot:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "Viestin tallennus ei onnistunut."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut."
 
@@ -3447,7 +3983,7 @@ msgstr ""
 "Sinulla on uusi lähetysosoite palvelussa %1$s.\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "Uusi yksityisviesti käyttäjältä %s"
@@ -3461,7 +3997,7 @@ msgstr ""
 "%1$s (%2$s) lähetti sinulle yksityisviestin:\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
 
@@ -3470,31 +4006,39 @@ msgid "This form should automatically submit itself. "
 msgstr "Tämän lomakkeen pitäisi automaattisesti lähettää tiedot. "
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Suosikit"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Käyttäjän %s suosikkipäivitykset"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Käyttäjä"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Sinulle saapuneet viestit"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Lähetetyt"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Lähettämäsi viestit"
 
@@ -3507,14 +4051,19 @@ msgid "Twitter integration options"
 msgstr "Twitter yhdistämisen asetukset"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "Vastaanottaja"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "Ei voitu lukea viestiä."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s ja kaverit, sivu %d"
@@ -3524,21 +4073,31 @@ msgid "You can upload your personal avatar."
 msgstr "Voit ladata oman profiilikuvasi."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Profiilikuva-asetukset"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Alkuperäinen"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Esikatselu"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Rajaa"
 
@@ -3555,34 +4114,43 @@ msgid "There was a problem with your session token. "
 msgstr "Istuntoavaimesi kanssa oli ongelma."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Tiedoston data hävisi."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "Tiedosto hävisi."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "Tunnistamaton tiedoston tyyppi"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "Profiilia ei ole määritelty."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "Ei profiilia tuolle ID:lle."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Estä käyttäjä"
 
@@ -3590,11 +4158,11 @@ msgstr "Estä käyttäjä"
 msgid "Are you sure you want to block this user? "
 msgstr "Oletko varma että haluat estää tämän käyttäjän?"
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Sinä olet jo estänyt tämän käyttäjän."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "Käyttäjän estotiedon tallennus epäonnistui."
 
@@ -3611,38 +4179,56 @@ msgstr "Olet poistamassa pysyvästi tämän päivityksen. "
 msgid "Add to favorites"
 msgstr "Lisää suosikkeihin"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Muokkaa ryhmää %s"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr "Toimiakseen postilaatikkojen pitää olla käytössä ryhmille"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "Tunnusta ei ole."
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "Tuota ryhmää ei ole."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Sinun pitää olla ylläpitäjä, jotta voit muokata ryhmää"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
@@ -3651,14 +4237,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr "Tunnuksessa voi olla ainoastaan pieniä kirjaimia "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "kuvaus on liian pitkä (max 140 merkkiä)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "Ei voitu päivittää ryhmää."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "Asetukset tallennettu."
 
@@ -3675,7 +4262,8 @@ msgstr "Tee uusi sähköpostiosoite päivityksien lähettämiseen; "
 msgid "Send me email when someone "
 msgstr "Lähetä sähköpostia kun joku "
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Salli kavereiden tönäistä minua ja lähetä sähköpostilla ilmoitus."
 
@@ -3687,7 +4275,7 @@ msgstr "Sähköpostiosoite on jo käytössä "
 msgid "A confirmation code was sent to the email address you added. "
 msgstr "Vahvistuskoodi lähetettiin lisäämääsi sähköpostiosoitteeseen. "
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "Palvelinvirhe - käyttäjän tietoja ei saatu!"
 
@@ -3701,51 +4289,66 @@ msgstr "Jos haluat %s-sovelluksen automaattisesti päivittävän "
 msgid "Allow %s to update my Facebook status"
 msgstr "Salli palvelun %s päivittää Facebook-tilani"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Ohita"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr "Päivityksellä ei ole sisältöä!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Sivutus"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "Myöhemmin"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "Aiemmin"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Kiitos, kun kutsuit kavereitasi käyttämään palvelua %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "Kutsu lähetettiin seuraaville henkilöille:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "Sinut on kutsuttu palveluun %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr "Kutsu kavereitasi käyttämään %s palvelua"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Kaverisi jotka käyttävät jo %s palvelua:"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Lähetä kutsut"
@@ -3754,7 +4357,6 @@ msgstr "Lähetä kutsut"
 msgid "Couldn't remove Facebook user."
 msgstr "Facebook käyttäjää ei voitu poistaa."
 
-# Pitää tarkistaa mitä nuo sync on!
 #: actions/facebooksettings.php:65
 msgid "There was a problem saving your sync preferences!"
 msgstr "Synkronointiasetusten tallennus epäonnistui!"
@@ -3788,12 +4390,14 @@ msgstr "Jos haluat että %s päivittää automaattisesti "
 msgid "Sync preferences"
 msgstr "Synkronointiasetukset"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Poista suosikeista"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Suosituimmat päivitykset"
 
@@ -3807,7 +4411,8 @@ msgid "The most popular notices on the site right now."
 msgstr "Suosituimmat päivitykset sivustolla juuri nyt."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Esittelyssä olevat käyttäjät"
 
@@ -3816,21 +4421,22 @@ msgstr "Esittelyssä olevat käyttäjät"
 msgid "Featured users, page %d"
 msgstr "Esittelyssä olevat käyttäjät, sivu %d"
 
-# Valikoima, joukko
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some of the great users on %s"
 msgstr "Valikoima joitakin loistavia palvelun %s käyttäjiä"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "ID-tunnusta ei ole"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Ryhmän logo"
 
@@ -3838,11 +4444,13 @@ msgstr "Ryhmän logo"
 msgid "You can upload a logo image for your group."
 msgstr "Voit ladata ryhmälle logon."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Logo päivitetty."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "Logon päivittäminen epäonnistui."
 
@@ -3861,7 +4469,8 @@ msgid "A list of the users in this group."
 msgstr "Lista ryhmän käyttäjistä."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Ryhmät"
 
@@ -3876,6 +4485,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "%%%%site.name%%%%-ryhmissä voit löytää ja keskustella "
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "Luo uusi ryhmä"
 
@@ -3886,7 +4496,7 @@ msgid ""
 msgstr ""
 "Hae %%site.name%% ryhmiä niiden nimen, paikan tai kuvauksen perusteella. "
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Ryhmähaku"
 
@@ -3908,20 +4518,20 @@ msgstr "Lähetä minulle vastaukset Jabberin/GTalkin kautta "
 msgid "A confirmation code was sent "
 msgstr "Varmistuskoodi lähetettiin "
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "Sinä kuulut jo tähän ryhmään "
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Käyttäjää %s ei voinut liittää ryhmään %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s liittyi ryhmään %s"
@@ -3931,15 +4541,18 @@ msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 "Postilaatikkojen täytyy olla otettu käyttöön, jotta ryhmäominaisuus toimii."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "Tuota ryhmää ei ole."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "Sinä et kuulu tähän ryhmään."
 
@@ -3947,21 +4560,25 @@ msgstr "Sinä et kuulu tähän ryhmään."
 msgid "You may not leave a group while you are its administrator."
 msgstr "Et voi erota ryhmästä, kun olet sen ylläpitäjä."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr "Ei löydetty käyttäjän jäsenyystietoja."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s erosi ryhmästä %s"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "Kirjaudu sisään"
 
@@ -3973,15 +4590,17 @@ msgstr "Ei nykyistä tilatietoa"
 msgid "New group"
 msgstr "Uusi ryhmä"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "Ryhmän luonti ei onnistunut."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
 
@@ -3993,11 +4612,14 @@ msgstr "Liikaa merkkejä. "
 msgid "Don't send a message to yourself; "
 msgstr "Älä lähetä viestiä itsellesi; "
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "Päivitys lähetetty"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Ajax-virhe"
 
@@ -4016,7 +4638,7 @@ msgstr "Tönäisy lähetetty"
 msgid "Nudge sent!"
 msgstr "Tönäisy lähetetty!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr "OpenID sisäänkirjautuminen"
 
@@ -4040,11 +4662,13 @@ msgstr "URL-osoitteen automaattinen lyhennys"
 msgid "Service"
 msgstr "Palvelu"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Käytettävä automaattinen lyhennyspalvelu."
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL-lyhennyspalvelun nimi on liian pitkä (max 50 merkkiä)."
 
@@ -4052,16 +4676,17 @@ msgstr "URL-lyhennyspalvelun nimi on liian pitkä (max 50 merkkiä)."
 msgid "Change your password."
 msgstr "Vaihda salasanasi."
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr "Salasanan vaihto"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Ei sallittu henkilötagi: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Käyttäjät joilla henkilötagi %s - sivu %d"
@@ -4071,11 +4696,12 @@ msgstr "Käyttäjät joilla henkilötagi %s - sivu %d"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Näillä käyttäjillä on henkilötagi \"%s\" "
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profiilitieto"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4087,20 +4713,25 @@ msgid "Automatically subscribe to whoever "
 msgstr "Tilaa automaattisesti kaikki, jotka "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Virheellinen tagi: \"%s\""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "Tageja ei voitu tallentaa."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Julkinen aikajana, sivu %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Julkista päivitysvirtaa ei saatu."
 
@@ -4117,17 +4748,18 @@ msgstr ""
 msgid "Public tag cloud"
 msgstr "Julkinen tagipilvi"
 
-# ssa pääte ensimmäistä kertaa
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
 msgstr "Nämä ovat suosituimmat viimeaikaiset tagit %s -palvelussa"
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "Tagipilvi"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
 
@@ -4175,10 +4807,10 @@ msgstr "(Sinun pitäisi saada viesti sähköpostilla "
 #: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
-"Tämä on paikallinen profiili. Kirjaudu sisään, jotta voit tilata "
-"päivitykset."
+"Tämä on paikallinen profiili. Kirjaudu sisään, jotta voit tilata päivitykset."
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Vastaukset käyttäjälle %s, sivu %d"
@@ -4188,52 +4820,71 @@ msgstr "Vastaukset käyttäjälle %s, sivu %d"
 msgid "%s favorite notices, page %d"
 msgstr "Käyttäjän %s suosikkipäivitykset, sivu %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Ryhmä %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Ryhmä %s, sivu %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Ryhmän profiili"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
-# Missähän yhteydessä tämä oikein on. pitää tarkistaa vielä
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr "Huomaa"
 
-# Pitää tarkistaa
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Ryhmän toiminnot"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr "Päivityssyöte ryhmälle %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Jäsenet"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(Tyhjä)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "Kaikki jäsenet"
 
@@ -4243,14 +4894,14 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on "
-"[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)"
+"**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on [mikroblogauspalvelu]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
 msgstr "Vain lähettäjä ja vastaanottaja "
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, sivu %d"
@@ -4260,30 +4911,37 @@ msgid "'s profile"
 msgstr "nimisen käyttäjän profiili"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "Käyttäjän profiili"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Kuva"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "Käyttäjän toiminnot"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "Lähetä suora viesti tälle käyttäjälle"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Viesti"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "Kaikki tilaajat"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "Kaikki ryhmät"
 
@@ -4308,7 +4966,7 @@ msgstr "Lähetä minulle päivitykset SMS:n välityksellä; "
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Vahvistuskoodi on lähetetty antamaasi puhelinnumeroon. "
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Matkapuhelinoperaattori"
 
@@ -4366,17 +5024,17 @@ msgstr "Tässä ovat ihmiset, joiden päivityksiä "
 msgid "These are the people whose "
 msgstr "Tässä ovat ihmiset, joiden "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-# tagi, tägätty, tagätty, tagatty, tagitetty,
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Päivitykset joissa on tagi %s, sivu %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "Viestit joissa on tagi %s, uusimmat ensin"
@@ -4398,7 +5056,7 @@ msgstr "Tagi %s"
 msgid "Tag user"
 msgstr "Tagaa käyttäjä"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4410,18 +5068,18 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "Istuntoavaimesi kanssa oli ongelma."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Voit tagata ainoastaan ihmisiä, joita tilaat tai jotka tilaavat sinun "
 "päivityksiäsi."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Tagien tallennus epäonnistui."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Käytä tätä lomaketta lisätäksesi tageja tilaajillesi ja käyttäjille jotka "
@@ -4431,20 +5089,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "Tuota tagia ei ole."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "Mikroblogi merkitty tageillä %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Käyttäjän esto epäonnistui."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "Käyttäjän eston poisto epäonnistui."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Ei löytynyt."
 
@@ -4452,15 +5113,16 @@ msgstr "Ei löytynyt."
 msgid "Add your Twitter account to automatically send "
 msgstr "Lisää Twitter käyttäjätilisi lähettääksesi automaattisesti "
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Twitter käyttäjätunnus"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Twitter salasana"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Twitter kaverit"
 
@@ -4473,145 +5135,154 @@ msgstr "Käyttäjätunnuksessa voi olla ainoastaan numeroita, "
 msgid "Unable to retrieve account information "
 msgstr "Käyttäjätietoa ei saatu "
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "Tapahtui virhe, kun estoa poistettiin."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "Ei profiili id:tä kyselyssä."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "Ei profiilia tuolla id:llä."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Tilaus lopetettu"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "Käyttäjän %s ryhmät"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Käyttäjän %s ryhmät, sivu %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
 "päivityksien lähettämista muutaman minuutin päästä."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Päivityksesi tähän palveluun on estetty."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Lataa kuva"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Muut"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Muita asetuksia"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Nimetön sivu"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Ensisijainen sivunavigointi"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Hae ihmisiä tai tekstiä"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Käyttäjätili"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Yhdistä pikaviestimeen, SMS, Twitteriin"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Kirjaudu ulos palvelusta"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Kirjaudu sisään palveluun"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Luo uusi käyttäjätili"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "Kirjaudu sisään OpenID-tunnuksella"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "Auta minua!"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr "Palvelun ilmoitus"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "Paikalliset näkymät"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr "Sivuilmoitus"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Toissijainen sivunavigointi"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "StatusNet-ohjelmiston lisenssi"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "Kaikki "
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "lisenssi."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "Estä tämä käyttäjä"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Estä"
 
@@ -4624,11 +5295,14 @@ msgstr "Poista tämä päivitys suosikeista"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "Käyttääksesi %s Facebook-sovellusta sinun pitää kirjautua sisään "
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr " uusi käyttäjätili."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "Julkaistu"
 
@@ -4640,7 +5314,6 @@ msgstr "Merkitse päivitys suosikkeihin"
 msgid "Export data"
 msgstr "Vie tietoja"
 
-# Filtteröi, erota,...
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Suodata tagien perusteella"
@@ -4649,55 +5322,60 @@ msgstr "Suodata tagien perusteella"
 msgid "All"
 msgstr "Kaikki"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Tagi"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Valitse tagi lyhentääksesi listaa"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Mene"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Kuvaus"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
-"Ryhmän paikka, jos sellainen on, kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
+"Ryhmän paikka, jos sellainen on, kuten \"Kaupunki, Maakunta (tai Lääni), Maa"
+"\""
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Ryhmä"
 
-# Hallinnointi, ylläpitäjä
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "Ylläpito"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Muokkaa %s ryhmän ominaisuuksia"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Lisää ryhmälle %s logo tai muokkaa sitä "
@@ -4727,11 +5405,11 @@ msgstr "Liity"
 msgid "Leave"
 msgstr "Eroa"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Luo uusi käyttäjätili"
 
@@ -4753,17 +5431,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s seuraa nyt käyttäjää"
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Kotipaikka: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Kotisivu: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4772,12 +5450,11 @@ msgstr ""
 "Tietoja: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s tönäisi sinua"
 
-# joo, vähän hämärä
 #: lib/mail.php:465
 #, php-format
 msgid "%1$s (%2$s) is wondering what you are up to "
@@ -4788,39 +5465,47 @@ msgstr "%1$s (%2$s) miettii mitä hommailet "
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s lisäsi juuri päivityksesi ajalta %2$s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "Lähettäjä"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Lähetä suora viesti"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "Lähetä päivitys"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Sallitut merkit"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "vastaus viestiin"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Vastaa tähän päivitykseen"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Vastaus"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Poista tämä päivitys"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Poista"
 
@@ -4841,31 +5526,32 @@ msgstr "Lähetä tönäisy tälle käyttäjälle"
 msgid "Tags in %s's notices"
 msgstr "Tagit käyttäjän %s päivityksissä"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(tyhjä)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Julkinen"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Käyttäjäryhmät"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Viimeaikaiset tagit"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Esittelyssä"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Suosituimmat"
 
-# Notice suomennos vielä hakusessa
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Päivitys"
@@ -4878,31 +5564,33 @@ msgstr "Etsi ryhmiä tästä palvelusta"
 msgid "Untitled section"
 msgstr "Nimetön osa"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Ihmiset joiden tilaaja %s on"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Ryhmät, joiden jäsen %s on"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Käyttäjä on asettanut eston sinulle."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Tilaa tämä käyttäjä"
 
@@ -4915,13 +5603,2077 @@ msgid "Top posters"
 msgstr "Eniten päivityksiä"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Poista esto tältä käyttäjältä"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Poista esto"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Peruuta tämän käyttäjän tilaus"
+
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Käyttäjän %s kavereiden syöte (RSS 1.0)"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Käyttäjän %s kavereiden syöte (RSS 2.0)"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Käyttäjän %s kavereiden syöte (Atom)"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+msgid "You and friends"
+msgstr "Sinä ja kaverit"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
+
+#: actions/avatarsettings.php:373
+msgid "Avatar deleted."
+msgstr "Kuva poistettu."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Olet poistamassa tämän päivityksen pysyvästi.  Kun tämä on tehty, poistoa ei "
+"voi enää perua."
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
+"uudelleen."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Lähetä sähköpostia, jos joku lähettää minulle yksityisviestin."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Voit ladata ryhmälle logon."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi"
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, php-format
+msgid "Microblog by %s group"
+msgstr "Käyttäjän %s mikroblogi"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Hae ihmisiä palvelun %%site.name%% käyttäjien nimistä, paikoista ja "
+"kiinnostuksen kohteista. Erota hakutermit välilyönnillä; hakutermien pitää "
+"olla 3 tai useamman merkin pituisia."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Tapahtui virhe suoran viestin lähetyksessä."
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Hakusyöte haulle \"%s\""
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
+"asetuksiesi muuttamista."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Julkinen syöte"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Julkinen syöte"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Julkinen syöte"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" poislukien yksityinen tieto: salasana, sähköpostiosoite, IM osoite, "
+"puhelinnumero."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Luo"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Ryhmän profiili"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "nimisen käyttäjän profiili"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Käyttäjän %s lähetetyt viestit"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Kuva"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profiiliasetukset"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Vahvistuskoodi on lähetetty puhelinnumeroosi. Katso tekstiviesteistäsi "
+"vahvistuskoodisi ja miten sitä käytetään. "
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Tuota käyttäjää ei ole."
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Lisää Twitter käyttäjätunnuksesi lähettääksesi päivitykset automaattisesti "
+"myös Twitteriin, "
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Ei pystytty hakemaan käyttäjän \"%s\" tietoja Twitteristä."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"Tarkista nämä tiedot varmistaaksesi, että haluat tilata tämän käyttäjän "
+"päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, "
+"paina \"Peruuta\"."
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Hae ihmisiä tai tekstiä"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
+"päivityksien lähettämista muutaman minuutin päästä."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Yhdistä pikaviestimeen, SMS, Twitteriin"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Tönäise"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "Käyttääksesi %s Facebook-sovellusta sinun pitää kirjautua sisään "
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s seuraa nyt päivityksiäsi palvelussa %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Terveisin,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Haku"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Dokumenttia ei ole."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Lista ryhmän käyttäjistä."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Lista ryhmän käyttäjistä."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Käyttäjän profiili"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s ja kaverit, sivu %d"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Lista ryhmän käyttäjistä."
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Käyttäjän eston poisto epäonnistui."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Vahvistuskoodi"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Tätä päivitystä ei voi poistaa."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Virheellinen tagi: \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Ei voitu lisätä suosikiksi."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Uusi päivitys"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Uusi päivitys"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Tuo ei ole kelvollinen tunnus."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Profiilia ei ole määritelty."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Käyttäjä on asettanut eston sinulle."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Estä käyttäjä"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Ryhmät"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Ei voitu päivittää käyttäjää."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Twitter-asetuksia ei voitu tallentaa!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Synkronointiasetukset tallennettiin."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Sinun pitää olla ylläpitäjä, jotta voit muokata ryhmää"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Ylläpito"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Ei hakutuloksia"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Käyttäjä on asettanut eston sinulle."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Viesti"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Ei voitu tallentaa profiilia."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) mahdollistaa kirjautumisen sisään useaan palveluun "
+"yhdellä tunnuksella. Voit hallinnoida OpenID-tunnuksiasi täällä."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profiiliasetukset"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"Tämä on %%site.name%%, [mikroblogaus](http://en.wikipedia.org/wiki/Micro-"
+"blogging)palvelu "
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Jos olet unohtanut tai hukannut salasanasi, voit saada uuden sähköpostiisi, "
+"jonka olet tallettanut  käyttäjätunnuksellesi."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Sinut on tunnistettu. Syötä  uusi salasana alle. "
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Salasanan palautuspyyntö lähetetty."
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Virhe vahvistuskoodin kanssa."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Tilaa tämä käyttäjä"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Käyttäjän %s suosikkipäivitykset, sivu %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Päivityssyöte ryhmälle %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Päivityssyöte ryhmälle %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Päivityssyöte ryhmälle %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on [mikroblogauspalvelu]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Ylläpito"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Käyttäjä ei ole rekisteröitynyt tähän palveluun."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Päivitykset joilla on tagi %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Päivityssyöte ryhmälle %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"Käyttäjällä **%s** on käyttäjätili palvelussa %%%%site.name%%%%, joka on "
+"[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)"
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s seuraa nyt käyttäjää"
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Tämä päivitys on jo suosikki!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Tämä päivitys ei ole suosikki!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Julkista päivitysvirtaa ei saatu."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "Vastaanottajaa ei ole määritelty."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Ei löytynyt yhtään päivitystä."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Vastaukset päivitykseen %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "lisenssi."
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Käyttäjän %s tilaukset"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profiiliasetukset"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Ongelma päivityksen tallentamisessa."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Viesti käyttäjälle %1$s, %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Käyttäjän profiili"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profiili"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Lataa"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Vaihda salasanasi"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Yhdistä"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Haku"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Kirjaudu sisään"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Estä"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Estä käyttäjä"
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Lisää ryhmälle %s logo tai muokkaa sitä "
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Ei sisältöä!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Käyttäjä"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Haku"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Kotisivun verkko-osoite ei ole toimiva."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Tuota tagia ei ole."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Suorat viestit käyttäjälle %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on 140 merkkiä."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Ei voitu tilata käyttäjää: Käyttäjää ei löytynyt."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "kuvaus on liian pitkä (max 140 merkkiä)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Sinä kuulut jo tähän ryhmään "
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Käyttäjää %s ei voinut liittää ryhmään %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Käyttäjän %s ryhmät"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Ryhmät, joiden jäsen %s on"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Ryhmän toiminnot"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Kuva poistettu."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Päivitys on liian pitkä. Maksimipituus on 140 merkkiä."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Kuvatiedoston formaattia ei ole tuettu."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Kuva"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "kuvaus on liian pitkä (max 140 merkkiä)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Käyttäjää jota seurataan ei ole olemassa."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Ei valtuutusta."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Ei voitu muuttaa request tokeneita access tokeneiksi."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Tuntematon OMB-protokollan versio."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Päivitystä ei ole."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Tiedosto hävisi."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Tämä sivu ei ole saatavilla "
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Kirjaud sisään käyttäjätunnuksella ja salasanalla. Ei vielä "
+"käyttäjätunnusta? [Rekisteröi](%%action.register%%) käyttäjätunnus tai "
+"kokeile [OpenID](%%action.openidlogin%%)-tunnuksella sisään kirjautumista. "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Kaikki päivitykset hakuehdolla \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Yhdistä"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Kuvaile itseäsi ja kiinnostuksiasi 140 merkillä"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Kuvaile itseäsi ja"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr ""
+"Tuo ei ole kelvollinen profiilin verkko-osoite (YADIS dokumenttia ei "
+"löytynyt)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
+"Tämä on paikallinen profiili. Kirjaudu sisään, jotta voit tilata päivitykset."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Ei saatu request tokenia."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Viesti käyttäjälle %1$s, %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Käyttäjän %s kavereiden syöte (RSS 1.0)"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Käyttäjän %s kavereiden syöte (RSS 2.0)"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Käyttäjän %s kavereiden syöte (Atom)"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Käyttäjän %s lähetetyt viestit"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Päivitys lähetetty"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Tämä sivu ei ole saatavilla "
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Tarkista nämä tiedot varmistaaksesi, että haluat tilata tämän käyttäjän "
+"päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, "
+"paina \"Peruuta\"."
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"Päivityksen tilaus on hyväksytty, mutta callback-osoitetta palveluun ei ole "
+"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hyväksytään. "
+"Tilauskoodisi on:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Päivityksen tilaus on hylätty, mutta callback-osoitetta palveluun ei ole "
+"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hylätään kokonaan."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Kuvan '%s' tyyppi on väärä"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet-ohjelmiston lisenssi"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Tönäisy lähetetty"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Vastaa tähän päivitykseen"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Ongelma päivityksen tallentamisessa."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Varmistuskoodia ei ole annettu."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Kirjaudu sisään palveluun"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Valitse operaattori"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Uusi päivitys"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s lisäsi päivityksesi suosikkeihinsa"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " lähteestä "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Julkista päivitysvirtaa ei saatu."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Poista päivitys"
diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo
index 1d3509af1..c85377e96 100644
--- a/locale/fr/LC_MESSAGES/statusnet.mo
+++ b/locale/fr/LC_MESSAGES/statusnet.mo
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 23365960b..6e10e917c 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -1,79 +1,66 @@
-# #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#
-# French translations for StatusNet package
-# Traductions françaises du paquet StatusNet.
-# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the StatusNet package.
-# Florian Birée <florian@biree.name>, 2008.
-# For translation choices and other informations, please read
-# <http://dev.filyb.info/statusnet/wiki/french-translation>
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#
+# Translation of StatusNet to French
 #
+# Author@translatewiki.net: IAlex
+# Author@translatewiki.net: Jean-Frédéric
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-05-01 23:42+0000\n"
-"Last-Translator: Nicolas Ritoux <niko@vulusu.ca>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:37+0000\n"
+"Language-Team: French\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fr\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64
-#: actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Flux de recherche pour « %s »"
 
-# à l'exception de ces données personnelles : mot de passe, adresse e-mail, adresse de messagerie instantanée, numéro de téléphone.
-#: ../actions/finishopenidlogin.php:82
-#: ../actions/register.php:191
-#: actions/finishopenidlogin.php:88
-#: actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid " except this private data: password, email address, IM address, phone number."
-msgstr "à l'exception de ces données personnelles : mot de passe, adresse e-mail, adresse de messagerie instantanée, numéro de téléphone. "
-
-#: ../actions/showstream.php:400
-#: ../lib/stream.php:109
-#: actions/showstream.php:418
-#: lib/mailbox.php:164
-#: lib/stream.php:76
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
+msgid ""
+" except this private data: password, email address, IM address, phone number."
+msgstr ""
+"à l'exception de ces données personnelles : mot de passe, adresse e-mail, "
+"adresse de messagerie instantanée, numéro de téléphone. "
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
 msgstr "de"
 
-#: ../actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Réponses à %2$s"
 
-#: ../actions/invite.php:168
-#: actions/invite.php:176
-#: actions/invite.php:211
+#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s vous invite à vous inscrire sur %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, 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"
+"%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"
+"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"
@@ -83,11 +70,13 @@ msgid ""
 "\n"
 "%5$s\n"
 "\n"
-"If you'd like to try the service, click on the link below to accept the invitation.\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"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
@@ -120,10 +109,8 @@ msgstr ""
 "\n"
 "Cordialement, %2$s\n"
 
-#: ../lib/mail.php:124
-#: lib/mail.php:124
-#: lib/mail.php:126
-#: lib/mail.php:241
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s suit maintenant vos statuts dans %2$s."
@@ -145,3208 +132,2945 @@ msgstr ""
 "Cordialement,\n"
 "%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
-#: actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
 
-#: ../actions/shownotice.php:45
-#: actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Statut de %1$s sur %2$s"
 
-#: ../actions/invite.php:84
-#: ../actions/invite.php:92
-#: actions/invite.php:91
-#: actions/invite.php:99
-#: actions/invite.php:123
-#: actions/invite.php:131
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../actions/publicrss.php:62
-#: actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "Flux public de %s"
 
-#: ../actions/all.php:47
-#: ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238
-#: ../lib/stream.php:51
-#: actions/all.php:47
-#: actions/allrss.php:60
-#: actions/twitapistatuses.php:155
-#: lib/personal.php:51
-#: actions/all.php:65
-#: actions/allrss.php:103
-#: actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126
-#: lib/personalgroupnav.php:99
+#: ../actions/all.php:47 ../actions/allrss.php:60
+#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
+#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
+#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
+#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s et ses amis"
 
-#: ../actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Activité publique %s"
 
-#: ../lib/mail.php:206
-#: lib/mail.php:212
-#: lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "Statut de %s"
 
-#: ../actions/twitapistatuses.php:338
-#: actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Activité de %s"
 
-#: ../actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s statuts  "
 
-#: ../actions/register.php:213
-msgid "(You should receive a message by email momentarily, with instructions on how to confirm your email address.)"
-msgstr "(Vous recevrez bientôt un courriel contenant les instructions pour confirmer votre adresse.)"
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Vous recevrez bientôt un courriel contenant les instructions pour confirmer "
+"votre adresse.)"
 
-#: ../lib/util.php:257
-#: lib/util.php:273
-#: lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
-msgid "**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). "
-msgstr "**%%site.name%%** est un service de microblogging qui vous est proposé par  [%%site.broughtby%%](%%site.broughtbyurl%%)."
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** est un service de microblogging qui vous est proposé par  "
+"[%%site.broughtby%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259
-#: lib/util.php:275
-#: lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** est un service de micro-blogging."
 
-#: ../lib/util.php:274
-#: lib/util.php:290
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
-msgstr "Les utilisateurs doivent être désignés par leur nom complet ou leur pseudo."
-
-#: ../actions/finishopenidlogin.php:73
-#: ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79
-#: actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101
-#: actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+msgstr ""
+"Les utilisateurs doivent être désignés par leur nom complet ou leur pseudo."
+
+#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
 
-#: ../actions/register.php:152
-#: actions/register.php:166
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. Requis."
 
-#: ../actions/password.php:42
-#: actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 caractères ou plus"
 
-#: ../actions/recoverpassword.php:180
-#: actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 caractères ou plus, et ne l'oubliez pas !"
 
-#: ../actions/register.php:154
-#: actions/register.php:168
-#: actions/register.php:373
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 caractères ou plus. Requis."
 
-#: ../actions/imsettings.php:197
-#: actions/imsettings.php:205
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
-msgid "A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you."
-msgstr "Un code de confirmation a été envoyé à votre adresse de messagerie instantanée. Vous devez approuver %s pour recevoir des messages."
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"Un code de confirmation a été envoyé à votre adresse de messagerie "
+"instantanée. Vous devez approuver %s pour recevoir des messages."
 
-#: ../actions/emailsettings.php:213
-#: actions/emailsettings.php:231
-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."
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 "Un code de confirmation a été envoyé à l'adresse courriel indiquée. Vérifiez "
 "votre boîte de réception pour récupérer le code et les instructions."
 
-#: ../actions/smssettings.php:216
-#: actions/smssettings.php:224
-msgid "A confirmation code was sent to the phone number you added. Check your inbox (and spam box!) for the code and instructions on how to use it."
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
 msgstr ""
 "Un code de confirmation a été envoyé au numéro de téléphone indiqué. "
-"Vérifiez votre boîte de réception pour récupérer le code et les "
-"instructions."
-
-#: ../actions/twitapiaccount.php:49
-#: ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88
-#: ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370
-#: ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-#: actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104
-#: actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120
-#: actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46
-#: actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176
-#: actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298
-#: actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463
-#: actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-#: actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111
-#: actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102
-#: actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44
-#: actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151
-#: actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147
-#: actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239
-#: actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402
-#: actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+"Vérifiez votre boîte de réception pour récupérer le code et les instructions."
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 actions/twitapiaccount.php:37
+#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
+#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
+#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
+#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
+#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
+#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
+#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Méthode API non trouvée !"
 
-#: ../actions/twitapiaccount.php:57
-#: ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119
-#: ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34
-#: ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
 #: ../actions/twitapidirect_messages.php:49
 #: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62
-#: ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47
-#: ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52
-#: ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35
-#: ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56
-#: actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114
-#: actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33
-#: actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168
-#: actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29
-#: actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-#: actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97
-#: actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184
-#: actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52
-#: actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31
-#: actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45
+#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
+#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
+#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
+#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "Méthode API en construction."
 
-#: ../lib/util.php:324
-#: lib/util.php:340
-#: lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "À propos"
 
-#: ../actions/userauthorization.php:119
-#: actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Accepter"
 
-#: ../actions/emailsettings.php:62
-#: ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57
-#: ../actions/smssettings.php:71
-#: actions/emailsettings.php:63
-#: actions/imsettings.php:64
-#: actions/openidsettings.php:58
-#: actions/smssettings.php:71
-#: actions/twittersettings.php:85
-#: actions/emailsettings.php:120
-#: actions/imsettings.php:127
-#: actions/openidsettings.php:111
-#: actions/smssettings.php:133
-#: actions/twittersettings.php:163
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/emailsettings.php:63 actions/imsettings.php:64
+#: actions/openidsettings.php:58 actions/smssettings.php:71
+#: actions/twittersettings.php:85 actions/emailsettings.php:120
+#: actions/imsettings.php:127 actions/openidsettings.php:111
+#: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../actions/openidsettings.php:43
-#: actions/openidsettings.php:44
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 #: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Ajouter un identifiant OpenID"
 
-#: ../lib/settingsaction.php:97
-#: lib/settingsaction.php:91
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 #: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
 msgstr "Ajouter ou supprimer des identifiants OpenIDs"
 
-#: ../actions/emailsettings.php:38
-#: ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
-#: actions/emailsettings.php:39
-#: actions/imsettings.php:40
-#: actions/smssettings.php:39
-#: actions/emailsettings.php:94
-#: actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Adresse"
 
-#: ../actions/invite.php:131
-#: actions/invite.php:139
-#: actions/invite.php:176
+#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Adresses d'amis à inviter (un par ligne)"
 
-#: ../actions/showstream.php:273
-#: actions/showstream.php:288
-#: actions/showstream.php:422
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Tous les abonnements"
 
-#: ../actions/publicrss.php:64
-#: actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Tous les statuts de %s"
 
-#: ../actions/noticesearchrss.php:66
-#: actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Statuts correspondant au(x) terme(s) \"%s\""
 
-#: ../actions/finishopenidlogin.php:29
-#: ../actions/login.php:31
-#: ../actions/openidlogin.php:29
-#: ../actions/register.php:30
-#: actions/finishopenidlogin.php:29
-#: actions/login.php:31
-#: actions/openidlogin.php:29
-#: actions/register.php:30
-#: actions/finishopenidlogin.php:34
-#: actions/login.php:77
-#: actions/openidlogin.php:30
-#: actions/register.php:92
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
+#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: actions/finishopenidlogin.php:29 actions/login.php:31
+#: actions/openidlogin.php:29 actions/register.php:30
+#: actions/finishopenidlogin.php:34 actions/login.php:77
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Déjà connecté."
 
-#: ../lib/subs.php:42
-#: lib/subs.php:42
-#: lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Déjà abonné !"
 
-#: ../actions/deletenotice.php:54
-#: actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Êtes-vous sûr(e) de vouloir supprimer ce statut ?"
 
-#: ../actions/userauthorization.php:77
-#: actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autoriser l'abonnement"
 
-#: ../actions/login.php:104
-#: ../actions/register.php:178
-#: actions/register.php:192
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "Ouvrir automatiquement ma session à l'avenir (déconseillé pour les ordinateurs publics ou partagés)"
-
-#: ../actions/profilesettings.php:65
-#: actions/profilesettings.php:98
-msgid "Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "M'abonner automatiquement à tous ceux qui s'abonnent à moi (recommandé pour les utilisateurs non-humains)"
-
-#: ../actions/avatar.php:32
-#: ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
-#: actions/avatarsettings.php:65
-#: actions/showgroup.php:209
-#: lib/accountsettingsaction.php:107
+msgstr ""
+"Ouvrir automatiquement ma session à l'avenir (déconseillé pour les "
+"ordinateurs publics ou partagés)"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"M'abonner automatiquement à tous ceux qui s'abonnent à moi (recommandé pour "
+"les utilisateurs non-humains)"
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34 actions/avatarsettings.php:65
+#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../actions/avatar.php:113
-#: actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Avatar mis à jour."
 
-#: ../actions/imsettings.php:55
-#: actions/imsettings.php:56
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, 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 "En attente d'une confirmation pour cette adresse. Vérifiez votre compte Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à votre liste de contacts ?)"
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+"En attente d'une confirmation pour cette adresse. Vérifiez votre compte "
+"Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à "
+"votre liste de contacts ?)"
 
-#: ../actions/emailsettings.php:54
-#: actions/emailsettings.php:55
-msgid "Awaiting confirmation on this address. Check your inbox (and spam box!) for a message with further instructions."
-msgstr "En attente d'une confirmation pour cette adresse. Vérifiez votre compte Jabber/GTalk pour recevoir de nouvelles instructions."
+#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"En attente d'une confirmation pour cette adresse. Vérifiez votre compte "
+"Jabber/GTalk pour recevoir de nouvelles instructions."
 
-#: ../actions/smssettings.php:58
-#: actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Numéro de téléphone en attente de confirmation."
 
-#: ../lib/util.php:1318
-#: lib/util.php:1452
+#: ../lib/util.php:1318 lib/util.php:1452
 msgid "Before »"
 msgstr "Avant »"
 
-#: ../actions/profilesettings.php:49
-#: ../actions/register.php:170
-#: actions/profilesettings.php:82
-#: actions/register.php:184
-#: actions/profilesettings.php:112
-#: actions/register.php:402
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Bio"
 
-#: ../actions/profilesettings.php:101
-#: ../actions/register.php:82
-#: ../actions/updateprofile.php:103
-#: actions/profilesettings.php:216
-#: actions/register.php:89
-#: actions/updateprofile.php:104
-#: actions/profilesettings.php:205
-#: actions/register.php:174
-#: actions/updateprofile.php:107
+#: ../actions/profilesettings.php:101 ../actions/register.php:82
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
+#: actions/profilesettings.php:205 actions/register.php:174
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "La bio est trop longue (140 caractères maximum)."
 
-#: ../lib/deleteaction.php:41
-#: lib/deleteaction.php:41
-#: lib/deleteaction.php:69
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Impossible de supprimer ce statut."
 
-#: ../actions/updateprofile.php:119
-#: actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Impossible de lire l'URL '%s'"
 
-#: ../actions/password.php:85
-#: ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404
-#: actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169
-#: actions/recoverpassword.php:347
+#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Impossible de sauvegarder le nouveau mot de passe."
 
-#: ../actions/emailsettings.php:57
-#: ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
-#: actions/emailsettings.php:58
-#: actions/imsettings.php:59
-#: actions/smssettings.php:62
-#: actions/emailsettings.php:111
-#: actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../lib/openid.php:121
-#: lib/openid.php:121
-#: lib/openid.php:130
+#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Impossible d'instancier l'objet client pour OpenID."
 
-#: ../actions/imsettings.php:163
-#: actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossible d'utiliser cet identifiant Jabber"
 
-#: ../actions/emailsettings.php:181
-#: actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Impossible d'utiliser cette adresse courriel"
 
-#: ../actions/password.php:45
-#: actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Modifier"
 
-#: ../lib/settingsaction.php:88
-#: lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Modifier le traitement des courriels"
 
-#: ../actions/password.php:32
-#: actions/profilesettings.php:36
+#: ../actions/password.php:32 actions/profilesettings.php:36
 #: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: ../lib/settingsaction.php:94
-#: lib/accountsettingsaction.php:111
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Modifier votre mot de passe"
 
-#: ../lib/settingsaction.php:85
-#: lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Modifier vos paramètres de profil"
 
-#: ../actions/password.php:43
-#: ../actions/recoverpassword.php:181
-#: ../actions/register.php:155
-#: ../actions/smssettings.php:65
-#: actions/profilesettings.php:182
-#: actions/recoverpassword.php:187
-#: actions/register.php:169
-#: actions/smssettings.php:65
-#: actions/passwordsettings.php:105
-#: actions/recoverpassword.php:221
-#: actions/register.php:376
-#: actions/smssettings.php:122
+#: ../actions/password.php:43 ../actions/recoverpassword.php:181
+#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: actions/profilesettings.php:182 actions/recoverpassword.php:187
+#: actions/register.php:169 actions/smssettings.php:65
+#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
+#: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: ../actions/confirmaddress.php:90
-#: actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 #: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Confirmer l'adresse"
 
-#: ../actions/emailsettings.php:238
-#: ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
-#: actions/emailsettings.php:256
-#: actions/imsettings.php:230
-#: actions/smssettings.php:253
-#: actions/emailsettings.php:379
-#: actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Confirmation annulée."
 
-#: ../actions/smssettings.php:63
-#: actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Code de confirmation"
 
-#: ../actions/confirmaddress.php:38
-#: actions/confirmaddress.php:38
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Code de confirmation non trouvé."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to...\n"
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
 "\n"
 "* Go to [your profile](%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"
+"* 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 ""
-"Félicitations, %s! Bienvenue dans %%%%site.name%%%%. Vous pouvez maintenant :\n"
+"Félicitations, %s! Bienvenue dans %%%%site.name%%%%. Vous pouvez "
+"maintenant :\n"
 "\n"
 "* Visiter [votre profil](%s) et publier votre premier statut.\n"
-"* Ajouter une adresse [Jabber/GTalk](%%%%action.imsettings%%%%) afin d'envoyer et recevoir vos statuts par messagerie instantanée.\n"
-"* [Chercher des personnes](%%%%action.peoplesearch%%%%) que vous pourriez connaître ou qui partagent vos intêrets.\n"
-"* Mettre votre [profil](%%%%action.profilesettings%%%%) à jour pour en dire plus à votre sujet.\n"
-"* Parcourir la [documentation](%%%%doc.help%%%%) en ligne pour en savoir plus sur le fonctionnement du service.\n"
+"* Ajouter une adresse [Jabber/GTalk](%%%%action.imsettings%%%%) afin "
+"d'envoyer et recevoir vos statuts par messagerie instantanée.\n"
+"* [Chercher des personnes](%%%%action.peoplesearch%%%%) que vous pourriez "
+"connaître ou qui partagent vos intêrets.\n"
+"* Mettre votre [profil](%%%%action.profilesettings%%%%) à jour pour en dire "
+"plus à votre sujet.\n"
+"* Parcourir la [documentation](%%%%doc.help%%%%) en ligne pour en savoir "
+"plus sur le fonctionnement du service.\n"
 "\n"
-"Merci pour votre inscription ! Nous vous souhaitons d'apprécier notre service."
+"Merci pour votre inscription ! Nous vous souhaitons d'apprécier notre "
+"service."
 
-#: ../actions/finishopenidlogin.php:91
-#: actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119
-#: lib/action.php:330
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Connecter"
 
-#: ../actions/finishopenidlogin.php:86
-#: actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Connecter à un compte existant"
 
-#: ../lib/util.php:332
-#: lib/util.php:348
-#: lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Contact"
 
-#: ../lib/openid.php:178
-#: lib/openid.php:178
-#: lib/openid.php:187
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Impossible de créer le formulaire OpenID : %s"
 
-#: ../actions/twitapifriendships.php:60
-#: ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60
-#: actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48
-#: actions/twitapifriendships.php:64
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Impossible de suivre l'utilisateur : %s est déjà dans votre liste."
 
-#: ../actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Impossible de suivre l'utilisateur : Utilisateur non trouvé."
 
-#: ../lib/openid.php:160
-#: lib/openid.php:160
-#: lib/openid.php:169
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Impossible de rediriger vers le serveur : %s"
 
-#: ../actions/updateprofile.php:162
-#: actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Impossible de sauvegarder les informations de l'avatar"
 
-#: ../actions/updateprofile.php:155
-#: actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Impossible de sauvegarder les informations du nouveau profil"
 
-#: ../lib/subs.php:54
-#: lib/subs.php:61
-#: lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Impossible d'abonner une autre personne à votre profil."
 
-#: ../lib/subs.php:46
-#: lib/subs.php:46
-#: lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Impossible de s'abonner."
 
-#: ../actions/recoverpassword.php:102
-#: actions/recoverpassword.php:105
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr "Impossible de mettre l'utilisateur à jour avec l'adresse courriel confirmée."
+msgstr ""
+"Impossible de mettre l'utilisateur à jour avec l'adresse courriel confirmée."
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Impossible de convertir les jetons de requête en jetons d'accès"
 
-#: ../actions/confirmaddress.php:84
-#: ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218
-#: ../actions/smssettings.php:241
-#: actions/confirmaddress.php:84
-#: actions/emailsettings.php:252
-#: actions/imsettings.php:226
-#: actions/smssettings.php:249
-#: actions/confirmaddress.php:126
-#: actions/emailsettings.php:375
-#: actions/imsettings.php:357
-#: actions/smssettings.php:370
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/confirmaddress.php:126 actions/emailsettings.php:375
+#: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Impossible de supprimer le courriel de confirmation."
 
-#: ../lib/subs.php:103
-#: lib/subs.php:116
-#: lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Impossible de cesser l'abonnement"
 
-#: ../actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Aucun statut n'a été trouvé."
 
-#: ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
 #: actions/remotesubscribe.php:178
 msgid "Couldn't get a request token."
 msgstr "Impossible d'obtenir le jeton de requête."
 
-#: ../actions/emailsettings.php:205
-#: ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
-#: actions/emailsettings.php:223
-#: actions/imsettings.php:195
-#: actions/smssettings.php:214
-#: actions/emailsettings.php:337
-#: actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: actions/emailsettings.php:337 actions/imsettings.php:311
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Impossible d'insérer le code de confirmation."
 
 #: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
-#: actions/finishremotesubscribe.php:218
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Impossible d'insérer un nouvel abonnement."
 
-#: ../actions/profilesettings.php:184
-#: ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299
-#: actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302
-#: actions/twitapiaccount.php:81
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Impossible d'enregistrer le profil."
 
-#: ../actions/profilesettings.php:161
-#: actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Impossible de mettre à jour l'auto-abonnement."
 
-#: ../actions/emailsettings.php:280
-#: ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298
-#: actions/emailsettings.php:312
-#: actions/emailsettings.php:440
-#: actions/emailsettings.php:462
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Impossible de mettre à jour le dossier de l'utilisateur."
 
-#: ../actions/confirmaddress.php:72
-#: ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259
-#: ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243
-#: ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157
-#: ../actions/smssettings.php:269
-#: actions/confirmaddress.php:72
-#: actions/emailsettings.php:174
-#: actions/emailsettings.php:277
-#: actions/imsettings.php:146
-#: actions/imsettings.php:251
-#: actions/profilesettings.php:256
-#: actions/smssettings.php:165
-#: actions/smssettings.php:277
-#: actions/confirmaddress.php:114
-#: actions/emailsettings.php:280
-#: actions/emailsettings.php:411
-#: actions/imsettings.php:252
-#: actions/imsettings.php:395
-#: actions/othersettings.php:162
-#: actions/profilesettings.php:259
-#: actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
+#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
+#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
+#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: actions/confirmaddress.php:72 actions/emailsettings.php:174
+#: actions/emailsettings.php:277 actions/imsettings.php:146
+#: actions/imsettings.php:251 actions/profilesettings.php:256
+#: actions/smssettings.php:165 actions/smssettings.php:277
+#: actions/confirmaddress.php:114 actions/emailsettings.php:280
+#: actions/emailsettings.php:411 actions/imsettings.php:252
+#: actions/imsettings.php:395 actions/othersettings.php:162
+#: actions/profilesettings.php:259 actions/smssettings.php:266
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Impossible de mettre à jour l'utilisateur."
 
-#: ../actions/finishopenidlogin.php:84
-#: actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Créer"
 
-#: ../actions/finishopenidlogin.php:70
-#: actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Créer un nouvel utilisateur avec ce pseudo."
 
-#: ../actions/finishopenidlogin.php:68
-#: actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Créer un nouveau compte"
 
-#: ../actions/finishopenidlogin.php:191
-#: actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Création d'un nouveau compte pour un OpenID qui a déjà un utilisateur."
 
-#: ../actions/imsettings.php:45
-#: actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Adresse Jabber/GTalk actuellement confirmée."
 
-#: ../actions/smssettings.php:46
-#: actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Numéro de téléphone actuellement confirmé pour recevoir les SMS."
 
-#: ../actions/emailsettings.php:44
-#: actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Adresse courriel actuellement confirmée."
 
-#: ../actions/showstream.php:356
-#: actions/showstream.php:367
+#: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "Actuellement"
 
-#: ../classes/Notice.php:72
-#: classes/Notice.php:86
-#: classes/Notice.php:91
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Erreur de base de donnée en insérant le hashtag : %s"
 
-#: ../lib/util.php:1061
-#: lib/util.php:1110
-#: classes/Notice.php:698
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Erreur de base de donnée en insérant la réponse :%s"
 
-# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
-# Nouveau message\n
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
-# à "Supprimer l'avis"
-#: ../actions/deletenotice.php:41
-#: actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Supprimer ce statut"
 
-#: ../actions/profilesettings.php:51
-#: ../actions/register.php:172
-#: actions/profilesettings.php:84
-#: actions/register.php:186
-#: actions/profilesettings.php:114
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Décrivez vos intérêts en 140 caractères"
 
-#: ../actions/register.php:158
-#: ../actions/register.php:161
-#: ../lib/settingsaction.php:87
-#: actions/register.php:172
-#: actions/register.php:175
-#: lib/settingsaction.php:87
-#: actions/register.php:381
-#: actions/register.php:385
-#: lib/accountsettingsaction.php:113
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Courriel"
 
-#: ../actions/emailsettings.php:59
-#: actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Adresse courriel"
 
-#: ../actions/emailsettings.php:32
-#: actions/emailsettings.php:32
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 #: actions/emailsettings.php:60
 msgid "Email Settings"
 msgstr "Paramètres du courriel"
 
-#: ../actions/register.php:73
-#: actions/register.php:80
-#: actions/register.php:163
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Cette adresse courriel est déjà utilisée."
 
-#: ../lib/mail.php:90
-#: lib/mail.php:90
-#: lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmation de l'adresse courriel"
 
-#: ../actions/emailsettings.php:61
-#: actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adresse courriel (ex : nom@mondomaine.com)"
 
-#: ../actions/invite.php:129
-#: actions/invite.php:137
-#: actions/invite.php:174
+#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Adresses courriel"
 
-#: ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Entrez un pseudo ou une adresse courriel."
 
-#: ../actions/smssettings.php:64
-#: actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Entrez le code que vous avez reçu sur votre téléphone."
 
-#: ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Erreur d'autorisation du jeton"
 
-#: ../actions/finishopenidlogin.php:253
-#: actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Erreur lors de la connexion de l'utilisateur sur OpenID"
 
-#: ../actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 #: actions/finishaddopenid.php:126
 msgid "Error connecting user."
 msgstr "Erreur lors de la connexion de l'utilisateur."
 
 #: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
-#: actions/finishremotesubscribe.php:166
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Erreur lors de l'insertion de l'avatar"
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
-#: actions/finishremotesubscribe.php:158
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Erreur lors de l'insertion du nouveau profil"
 
 #: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
-#: actions/finishremotesubscribe.php:182
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Erreur lors de l'insertion du profil distant"
 
-#: ../actions/recoverpassword.php:240
-#: actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Erreur lors de l'enregistrement de la confirmation du courriel."
 
-#: ../actions/userauthorization.php:140
-#: actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Erreur lors de l'enregistrement du profil distant"
 
-#: ../lib/openid.php:226
-#: lib/openid.php:226
-#: lib/openid.php:235
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Erreur lors de l'enregistrement du profil."
 
-#: ../lib/openid.php:237
-#: lib/openid.php:237
-#: lib/openid.php:246
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Erreur lors de l'enregistrement de l'utilisateur."
 
-#: ../actions/password.php:80
-#: actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide."
 
-#: ../actions/login.php:47
-#: ../actions/login.php:73
-#: ../actions/recoverpassword.php:307
-#: ../actions/register.php:98
-#: actions/login.php:47
-#: actions/login.php:73
-#: actions/recoverpassword.php:320
-#: actions/register.php:108
-#: actions/login.php:112
-#: actions/login.php:138
-#: actions/recoverpassword.php:354
-#: actions/register.php:198
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 actions/login.php:112 actions/login.php:138
+#: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Erreur lors de la configuration de l'utilisateur."
 
-#: ../actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 #: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Erreur lors de la mise à jour du profil"
 
 #: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
-#: actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Erreur lors de la mise à jour du profil distant"
 
-#: ../actions/recoverpassword.php:80
-#: actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 #: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
 msgstr "Erreur dans le code de confirmation."
 
-#: ../actions/finishopenidlogin.php:89
-#: actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Ce pseudo est déjà utilisé"
 
-#: ../lib/util.php:326
-#: lib/util.php:342
-#: lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "FAQ"
 
-#: ../actions/avatar.php:115
-#: actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "La mise à jour de l'avatar a échoué."
 
-#: ../actions/all.php:61
-#: ../actions/allrss.php:64
-#: actions/all.php:61
-#: actions/allrss.php:64
-#: actions/all.php:75
-#: actions/allrss.php:107
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Flux des amis de %s"
 
-#: ../actions/replies.php:65
-#: ../actions/repliesrss.php:80
-#: actions/replies.php:65
-#: actions/repliesrss.php:66
-#: actions/replies.php:134
-#: actions/repliesrss.php:71
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Flux des réponses à %s"
 
-#: ../actions/tag.php:55
-#: actions/tag.php:55
-#: actions/tag.php:61
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Flux du marquage %s"
 
-#: ../lib/searchaction.php:105
-#: lib/searchaction.php:105
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Chercher dans le contenu des statuts"
 
-#: ../lib/searchaction.php:101
-#: lib/searchaction.php:101
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Chercher des personnes sur ce site"
 
-#: ../actions/login.php:122
-msgid "For security reasons, please re-enter your user name and password before changing your settings."
-msgstr "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et votre mot de passe afin d'enregistrer vos préférences."
-
-#: ../actions/profilesettings.php:44
-#: ../actions/register.php:164
-#: actions/profilesettings.php:77
-#: actions/register.php:178
-#: actions/profilesettings.php:103
-#: actions/register.php:391
-#: actions/showgroup.php:235
-#: actions/showstream.php:262
-#: actions/tagother.php:105
-#: lib/groupeditform.php:142
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
+"votre mot de passe afin d'enregistrer vos préférences."
+
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:103 actions/register.php:391
+#: actions/showgroup.php:235 actions/showstream.php:262
+#: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Nom complet"
 
-#: ../actions/profilesettings.php:98
-#: ../actions/register.php:79
-#: ../actions/updateprofile.php:93
-#: actions/profilesettings.php:213
-#: actions/register.php:86
-#: actions/updateprofile.php:94
-#: actions/editgroup.php:195
-#: actions/newgroup.php:146
-#: actions/profilesettings.php:202
-#: actions/register.php:171
-#: actions/updateprofile.php:97
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: actions/editgroup.php:195 actions/newgroup.php:146
+#: actions/profilesettings.php:202 actions/register.php:171
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nom complet trop long (maximum de 255 caractères)."
 
-#: ../lib/util.php:322
-#: lib/util.php:338
-#: lib/action.php:344
-#: lib/action.php:566
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Aide"
 
-#: ../lib/util.php:298
-#: lib/util.php:314
-#: lib/action.php:322
-#: lib/facebookaction.php:200
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Accueil"
 
-#: ../actions/profilesettings.php:46
-#: ../actions/register.php:167
-#: actions/profilesettings.php:79
-#: actions/register.php:181
-#: actions/profilesettings.php:107
-#: actions/register.php:396
-#: lib/groupeditform.php:146
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:107 actions/register.php:396
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Site personnel"
 
-#: ../actions/profilesettings.php:95
-#: ../actions/register.php:76
-#: actions/profilesettings.php:210
-#: actions/register.php:83
-#: actions/editgroup.php:192
-#: actions/newgroup.php:143
-#: actions/profilesettings.php:199
-#: actions/register.php:168
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/editgroup.php:192 actions/newgroup.php:143
+#: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "L'adresse du site personnel n'est pas un URL valide. "
 
-#: ../actions/emailsettings.php:91
-#: actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Je veux envoyer mes statuts par courriel."
 
-#: ../lib/settingsaction.php:102
-#: lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
 
-#: ../actions/imsettings.php:60
-#: actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Adresse de messagerie instantanée"
 
-#: ../actions/imsettings.php:33
-#: actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 #: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "Paramètres de messagerie instantanée"
 
-#: ../actions/finishopenidlogin.php:88
-#: actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid "If you already have an account, login with your username and password to connect it to your OpenID."
-msgstr "Si vous avez déjà un compte, ouvrez une session avec votre identifiant et votre mot de passe pour les relier à votre OpenID."
-
-#: ../actions/openidsettings.php:45
-msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"."
-msgstr "Pour ajouter un OpenID à votre compte, entrez-le dans le champ ci-dessous et cliquez sur « Ajouter »."
-
-#: ../actions/recoverpassword.php:137
-msgid "If you've forgotten or lost your password, you can get a new one sent to the email address you have stored  in your account."
-msgstr "Si vous avez oublié ou perdu votre mot de passe, vous pouvez en recevoir un nouveau à l'adresse courriel indiquée dans votre compte. "
-
-#: ../actions/emailsettings.php:67
-#: ../actions/smssettings.php:76
-#: actions/emailsettings.php:68
-#: actions/smssettings.php:76
-#: actions/emailsettings.php:127
-#: actions/smssettings.php:140
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+"Si vous avez déjà un compte, ouvrez une session avec votre identifiant et "
+"votre mot de passe pour les relier à votre OpenID."
+
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Pour ajouter un OpenID à votre compte, entrez-le dans le champ ci-dessous et "
+"cliquez sur « Ajouter »."
+
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored  in your account."
+msgstr ""
+"Si vous avez oublié ou perdu votre mot de passe, vous pouvez en recevoir un "
+"nouveau à l'adresse courriel indiquée dans votre compte. "
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+#: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Courriel entrant"
 
-#: ../actions/emailsettings.php:283
-#: actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "L'adresse de courriel entrant a été supprimée."
 
-#: ../actions/password.php:69
-#: actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Ancien mot de passe incorrect"
 
-#: ../actions/login.php:67
-#: actions/login.php:67
-#: actions/facebookhome.php:131
-#: actions/login.php:132
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
-#: ../actions/recoverpassword.php:265
-msgid "Instructions for recovering your password have been sent to the email address registered to your account."
-msgstr "Les instructions pour récupérer votre mot de passe ont été envoyées à l'adresse courriel indiquée dans votre compte."
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Les instructions pour récupérer votre mot de passe ont été envoyées à "
+"l'adresse courriel indiquée dans votre compte."
 
-#: ../actions/updateprofile.php:114
-#: actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "URL de l'avatar invalide : '%s'"
 
-#: ../actions/invite.php:55
-#: actions/invite.php:62
-#: actions/invite.php:70
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Adresse courriel invalide : %s"
 
-#: ../actions/updateprofile.php:98
-#: actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Site personnel invalide '%s'"
 
-#: ../actions/updateprofile.php:82
-#: actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "URL de la licence invalide '%s'"
 
-#: ../actions/postnotice.php:61
-#: actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Contenu invalide"
 
-#: ../actions/postnotice.php:67
-#: actions/postnotice.php:68
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
 #: actions/postnotice.php:72
 msgid "Invalid notice uri"
 msgstr "URI du statut invalide"
 
-#: ../actions/postnotice.php:72
-#: actions/postnotice.php:73
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
 #: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "URL du statut invalide"
 
-#: ../actions/updateprofile.php:87
-#: actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "URL du profil invalide '%s'."
 
-#: ../actions/remotesubscribe.php:96
-#: actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "URL du profil invalide (mauvais format)"
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
-#: actions/finishremotesubscribe.php:80
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 msgstr "URL du profil invalide, retourné par le serveur."
 
-#: ../actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Taille incorrecte."
 
-#: ../actions/finishopenidlogin.php:235
-#: ../actions/register.php:93
-#: ../actions/register.php:111
-#: actions/finishopenidlogin.php:241
-#: actions/register.php:103
-#: actions/register.php:121
-#: actions/finishopenidlogin.php:279
-#: actions/register.php:193
-#: actions/register.php:211
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
-#: ../actions/invite.php:79
-#: actions/invite.php:86
-#: actions/invite.php:102
+#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Invitation(s) envoyée(s)"
 
-#: ../actions/invite.php:97
-#: actions/invite.php:104
-#: actions/invite.php:136
+#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Invitation(s) envoyée(s) aux personnes suivantes :"
 
-#: ../lib/util.php:306
-#: lib/util.php:322
-#: lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../actions/invite.php:123
-#: actions/invite.php:130
-#: actions/invite.php:104
+#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Inviter de nouveaux utilisateurs"
 
-#: ../lib/util.php:261
-#: lib/util.php:277
-#: lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 "Il utilise le logiciel de micro-blogging [StatusNet](http://status.net/), version %s, disponible sous la licence [GNU Affero General Public License] (http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+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 ""
+"Il utilise le logiciel de micro-blogging [StatusNet](http://status.net/), "
+"version %s, disponible sous la licence [GNU Affero General Public License] "
+"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
-#: actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Identifiant Jabber déjà utilisé par un autre utilisateur."
 
-#: ../actions/imsettings.php:62
-#: actions/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, 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 "Adresse Jabber ou GTalk (ex : nom@mondomaine.com). Assurez-vous d'ajouter %s à votre liste d'amis dans votre logiciel de messagerie instantanée ou dans GTalk."
+msgid ""
+"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
+"add %s to your buddy list in your IM client or on GTalk."
+msgstr ""
+"Adresse Jabber ou GTalk (ex : nom@mondomaine.com). Assurez-vous d'ajouter %s "
+"à votre liste d'amis dans votre logiciel de messagerie instantanée ou dans "
+"GTalk."
 
-#: ../actions/profilesettings.php:57
-#: actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Langue"
 
-#: ../actions/profilesettings.php:113
-#: actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "La langue est trop longue (255 caractères maximum)."
 
-#: ../actions/profilesettings.php:52
-#: ../actions/register.php:173
-#: actions/profilesettings.php:85
-#: actions/register.php:187
-#: actions/profilesettings.php:117
-#: actions/register.php:408
-#: actions/showgroup.php:244
-#: actions/showstream.php:271
-#: actions/tagother.php:113
-#: lib/groupeditform.php:156
-#: lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:117 actions/register.php:408
+#: actions/showgroup.php:244 actions/showstream.php:271
+#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Emplacement"
 
-#: ../actions/profilesettings.php:104
-#: ../actions/register.php:85
-#: ../actions/updateprofile.php:108
-#: actions/profilesettings.php:219
-#: actions/register.php:92
-#: actions/updateprofile.php:109
-#: actions/editgroup.php:201
-#: actions/newgroup.php:152
-#: actions/profilesettings.php:208
-#: actions/register.php:177
-#: actions/updateprofile.php:112
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: actions/editgroup.php:201 actions/newgroup.php:152
+#: actions/profilesettings.php:208 actions/register.php:177
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Emplacement trop long (maximum de 255 caractères)."
 
-#: ../actions/login.php:97
-#: ../actions/login.php:106
-#: ../actions/openidlogin.php:68
-#: ../lib/util.php:310
-#: actions/login.php:97
-#: actions/login.php:106
-#: actions/openidlogin.php:77
-#: lib/util.php:326
-#: actions/facebooklogin.php:93
-#: actions/login.php:186
-#: actions/login.php:239
-#: actions/openidlogin.php:112
-#: lib/action.php:335
-#: lib/facebookaction.php:288
-#: lib/facebookaction.php:315
-#: lib/logingroupnav.php:75
+#: ../actions/login.php:97 ../actions/login.php:106
+#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
+#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
+#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
+#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Ouvrir une session"
 
-#: ../actions/openidlogin.php:44
-#: actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Ouvrir une session avec un compte [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
-msgid "Login with your username and password. Don't have a username yet? [Register](%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%%). "
-msgstr "Ouvrez une session avec votre identifiant et votre mot de passe, ou [créez un compte](%%action.register%%), ou utilisez un identifiant [OpenID](%%action.openidlogin%%)."
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
+msgstr ""
+"Ouvrez une session avec votre identifiant et votre mot de passe, ou [créez "
+"un compte](%%action.register%%), ou utilisez un identifiant [OpenID](%%"
+"action.openidlogin%%)."
 
-#: ../lib/util.php:308
-#: lib/util.php:324
-#: lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Fermeture de session"
 
-#: ../actions/register.php:166
-#: actions/register.php:180
-#: actions/register.php:393
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nom plus long, votre \"vrai\" nom de préférence"
 
-#: ../actions/login.php:110
-#: actions/login.php:110
-#: actions/login.php:245
-#: lib/facebookaction.php:320
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Mot de passe perdu ?"
 
-#: ../actions/emailsettings.php:80
-#: ../actions/smssettings.php:89
-#: actions/emailsettings.php:81
-#: actions/smssettings.php:89
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Nouvelle adresse courriel pour poster ; annule l'ancienne."
 
-#: ../actions/emailsettings.php:27
-#: actions/emailsettings.php:27
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Configurez les courriels que vous souhaitez recevoir de %%site.name%%."
 
-#: ../actions/showstream.php:300
-#: actions/showstream.php:315
-#: actions/showstream.php:480
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Membre depuis"
 
-#: ../actions/userrss.php:70
-#: actions/userrss.php:67
-#: actions/userrss.php:72
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Micro-blogging par %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, 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 "Votre fournisseur de téléphonie mobile. Si vous connaissez un fournisseur qui accepte la réception de SMS par courriel mais qui n'est pas listé ici, écrivez-nous à %s."
-
-#: ../actions/finishopenidlogin.php:79
-#: ../actions/register.php:188
-#: actions/finishopenidlogin.php:85
-#: actions/register.php:202
-#: actions/finishopenidlogin.php:107
-#: actions/register.php:429
+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 ""
+"Votre fournisseur de téléphonie mobile. Si vous connaissez un fournisseur "
+"qui accepte la réception de SMS par courriel mais qui n'est pas listé ici, "
+"écrivez-nous à %s."
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Mes textes et mes fichiers sont disponibles sous"
 
-#: ../actions/emailsettings.php:82
-#: ../actions/smssettings.php:91
-#: actions/emailsettings.php:83
-#: actions/smssettings.php:91
-#: actions/emailsettings.php:142
-#: actions/smssettings.php:152
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+#: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Nouveau"
 
-#: ../lib/mail.php:144
-#: lib/mail.php:144
-#: lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nouvelle adresse courriel pour poster dans %s"
 
-#: ../actions/emailsettings.php:297
-#: actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "Nouvelle adresse courriel ajoutée."
 
-#: ../actions/finishopenidlogin.php:71
-#: actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Nouveau pseudo"
 
-#: ../actions/newnotice.php:87
-#: actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Nouveau statut"
 
-#: ../actions/password.php:41
-#: ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180
-#: actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101
-#: actions/recoverpassword.php:219
+#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
-msgstr "Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
-
-#: ../actions/login.php:101
-#: ../actions/profilesettings.php:41
-#: ../actions/register.php:151
-#: actions/login.php:101
-#: actions/profilesettings.php:74
-#: actions/register.php:165
-#: actions/login.php:228
-#: actions/profilesettings.php:98
-#: actions/register.php:367
-#: actions/showgroup.php:224
-#: actions/showstream.php:251
-#: actions/tagother.php:95
-#: lib/facebookaction.php:308
-#: lib/groupeditform.php:137
+msgstr ""
+"Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
+
+#: ../actions/login.php:101 ../actions/profilesettings.php:41
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+#: actions/login.php:228 actions/profilesettings.php:98
+#: actions/register.php:367 actions/showgroup.php:224
+#: actions/showstream.php:251 actions/tagother.php:95
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Pseudo"
 
-#: ../actions/finishopenidlogin.php:175
-#: ../actions/profilesettings.php:110
-#: ../actions/register.php:69
-#: actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225
-#: actions/register.php:76
-#: actions/editgroup.php:183
-#: actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134
-#: actions/profilesettings.php:214
-#: actions/register.php:159
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
+#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
+#: actions/newgroup.php:134 actions/profilesettings.php:214
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 
-#: ../actions/finishopenidlogin.php:165
-#: ../actions/profilesettings.php:88
-#: ../actions/register.php:67
-#: ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171
-#: actions/profilesettings.php:203
-#: actions/register.php:74
-#: actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205
-#: actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
+#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
+#: actions/register.php:74 actions/updateprofile.php:78
+#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Les pseudos ne peuvent contenir que des caractères minuscules et des chiffres, sans espaces."
+msgstr ""
+"Les pseudos ne peuvent contenir que des caractères minuscules et des "
+"chiffres, sans espaces."
 
-#: ../actions/finishopenidlogin.php:170
-#: actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Pseudo non autorisé."
 
-#: ../actions/remotesubscribe.php:72
-#: actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Pseudo de l'utilisateur que vous voulez suivre"
 
-#: ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Pseudo ou courriel"
 
-#: ../actions/deletenotice.php:59
-#: actions/deletenotice.php:60
-#: actions/block.php:147
-#: actions/deletenotice.php:118
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "Non"
 
-#: ../actions/imsettings.php:156
-#: actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Aucun identifiant Jabber"
 
-#: ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Pas de requête d'autorisation !"
 
-#: ../actions/smssettings.php:181
-#: actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Aucun fournisseur sélectionné."
 
-#: ../actions/smssettings.php:316
-#: actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Aucun code entré"
 
-#: ../actions/confirmaddress.php:33
-#: actions/confirmaddress.php:33
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Aucun code de confirmation."
 
-#: ../actions/newnotice.php:44
-#: actions/newmessage.php:53
-#: actions/newnotice.php:44
-#: classes/Command.php:197
-#: actions/newmessage.php:109
-#: actions/newnotice.php:126
-#: classes/Command.php:223
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
+#: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Aucun contenu !"
 
-#: ../actions/emailsettings.php:174
-#: actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Aucune adresse courriel."
 
-#: ../actions/userbyid.php:32
-#: actions/userbyid.php:32
-#: actions/userbyid.php:70
+#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
 msgstr "Aucun identifiant."
 
-#: ../actions/emailsettings.php:271
-#: actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "Aucune adresse pour le courriel entrant."
 
 #: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
-#: actions/finishremotesubscribe.php:68
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
 msgid "No nickname provided by remote server."
 msgstr "Aucun pseudo proposé par le serveur distant."
 
-#: ../actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59
-#: actions/leavegroup.php:81
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Aucun pseudo."
 
-#: ../actions/emailsettings.php:222
-#: ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
-#: actions/emailsettings.php:240
-#: actions/imsettings.php:214
-#: actions/smssettings.php:237
-#: actions/emailsettings.php:363
-#: actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:363 actions/imsettings.php:345
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Aucune confirmation à annuler."
 
-#: ../actions/smssettings.php:176
-#: actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Aucun numéro de téléphone."
 
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
-#: actions/finishremotesubscribe.php:75
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
 msgid "No profile URL returned by server."
 msgstr "Aucun URL de profil renvoyé par le serveur."
 
-#: ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Aucune adresse courriel enregistrée pour cet utilisateur."
 
-#: ../actions/userauthorization.php:49
-#: actions/userauthorization.php:55
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 #: actions/userauthorization.php:57
 msgid "No request found!"
 msgstr "Aucune requête trouvée !"
 
-#: ../actions/noticesearch.php:64
-#: ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69
-#: actions/peoplesearch.php:69
-#: actions/groupsearch.php:81
-#: actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/groupsearch.php:81 actions/noticesearch.php:104
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Aucun résultat "
 
-#: ../actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 #: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Aucune taille"
 
-#: ../actions/twitapistatuses.php:595
-#: actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-#: actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Aucun statut trouvé avec cet identifiant. "
 
-#: ../actions/twitapistatuses.php:555
-#: actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Aucun statut trouvé avec cet identifiant."
 
-#: ../actions/openidsettings.php:135
-#: actions/openidsettings.php:144
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 #: actions/openidsettings.php:222
 msgid "No such OpenID."
 msgstr "OpenID non trouvé."
 
-#: ../actions/doc.php:29
-#: actions/doc.php:29
-#: actions/doc.php:64
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Document non trouvé. "
 
-#: ../actions/shownotice.php:32
-#: ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
-#: actions/shownotice.php:32
-#: actions/shownotice.php:83
-#: lib/deleteaction.php:30
-#: actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Statut non trouvé. "
 
-#: ../actions/recoverpassword.php:56
-#: actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 #: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "Code de récupération non trouvé. "
 
-#: ../actions/postnotice.php:56
-#: actions/postnotice.php:57
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 #: actions/postnotice.php:60
 msgid "No such subscription"
 msgstr "Abonnement non trouvé "
 
-#: ../actions/all.php:34
-#: ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43
-#: ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57
-#: ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110
-#: ../actions/userbyid.php:36
-#: ../actions/userrss.php:35
-#: ../actions/xrds.php:35
-#: ../lib/gallery.php:57
-#: ../lib/subs.php:33
-#: ../lib/subs.php:82
-#: actions/all.php:34
-#: actions/allrss.php:35
-#: actions/avatarbynickname.php:43
-#: actions/favoritesrss.php:35
-#: actions/foaf.php:40
-#: actions/ical.php:31
-#: actions/remotesubscribe.php:93
-#: actions/remotesubscribe.php:100
-#: actions/replies.php:57
-#: actions/repliesrss.php:35
-#: actions/showfavorites.php:34
-#: actions/showstream.php:110
-#: actions/userbyid.php:36
-#: actions/userrss.php:35
-#: actions/xrds.php:35
-#: classes/Command.php:120
-#: classes/Command.php:162
-#: classes/Command.php:203
-#: classes/Command.php:237
-#: lib/gallery.php:62
-#: lib/mailbox.php:36
-#: lib/subs.php:33
-#: lib/subs.php:95
-#: actions/all.php:53
-#: actions/allrss.php:66
-#: actions/avatarbynickname.php:75
-#: actions/favoritesrss.php:64
-#: actions/foaf.php:41
-#: actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130
-#: actions/replies.php:73
-#: actions/repliesrss.php:38
-#: actions/showfavorites.php:105
-#: actions/showstream.php:100
-#: actions/userbyid.php:74
-#: actions/usergroups.php:92
-#: actions/userrss.php:38
-#: actions/xrds.php:73
-#: classes/Command.php:140
-#: classes/Command.php:185
-#: classes/Command.php:234
-#: classes/Command.php:271
-#: lib/galleryaction.php:60
-#: lib/mailbox.php:82
-#: lib/subs.php:34
-#: lib/subs.php:109
+#: ../actions/all.php:34 ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
+#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
+#: ../actions/replies.php:57 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:110 ../actions/userbyid.php:36
+#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
+#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
+#: actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95 actions/all.php:53 actions/allrss.php:66
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
+#: actions/foaf.php:41 actions/remotesubscribe.php:123
+#: actions/remotesubscribe.php:130 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/showstream.php:100 actions/userbyid.php:74
+#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
+#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
+#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Utilisateur non trouvé."
 
-#: ../actions/recoverpassword.php:211
-#: actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "Aucun utilisateur trouvé avec ce courriel ou ce nom."
 
-#: ../lib/gallery.php:80
-#: lib/gallery.php:85
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Il n'y a personne à montrer !"
 
-#: ../actions/recoverpassword.php:60
-#: actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 #: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "Ceci n'est pas un code de récupération."
 
-#: ../scripts/maildaemon.php:50
-#: scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Ceci n'est pas un utilisateur inscrit."
 
-#: ../lib/twitterapi.php:226
-#: ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#: lib/twitterapi.php:391
-#: lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-#: lib/twitterapi.php:448
-#: lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Format de données non supporté."
 
-#: ../actions/imsettings.php:167
-#: actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Identifiant Jabber invalide."
 
-#: ../lib/openid.php:131
-#: lib/openid.php:131
-#: lib/openid.php:140
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "OpenID invalide."
 
-#: ../actions/emailsettings.php:185
-#: actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Adresse courriel invalide"
 
-#: ../actions/register.php:63
-#: actions/register.php:70
-#: actions/register.php:152
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Adresse courriel invalide."
 
-#: ../actions/profilesettings.php:91
-#: ../actions/register.php:71
-#: actions/profilesettings.php:206
-#: actions/register.php:78
-#: actions/editgroup.php:186
-#: actions/newgroup.php:137
-#: actions/profilesettings.php:195
-#: actions/register.php:161
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
+#: actions/editgroup.php:186 actions/newgroup.php:137
+#: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Pseudo invalide."
 
-#: ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 #: actions/remotesubscribe.php:159
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "URL de profil invalide (services incorrects)."
 
-#: ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 #: actions/remotesubscribe.php:152
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "URL de profil invalide (aucun XRDS défini)."
 
-#: ../actions/remotesubscribe.php:104
-#: actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 #: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "URL de profil invalide (aucun document YADIS)."
 
-#: ../actions/avatar.php:95
-#: actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Ceci n'est pas une image, ou c'est un fichier corrompu."
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
-#: actions/finishremotesubscribe.php:54
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Non autorisé."
 
 #: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Réponse inattendue !"
 
-#: ../actions/twitapistatuses.php:422
-#: actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Non trouvé"
 
-#: ../actions/finishaddopenid.php:29
-#: ../actions/logout.php:33
-#: ../actions/newnotice.php:29
-#: ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25
-#: ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
-#: actions/disfavor.php:29
-#: actions/favor.php:30
-#: actions/finishaddopenid.php:29
-#: actions/logout.php:33
-#: actions/newmessage.php:28
-#: actions/newnotice.php:29
-#: actions/subscribe.php:28
-#: actions/unsubscribe.php:25
-#: lib/deleteaction.php:38
-#: lib/settingsaction.php:27
-#: actions/block.php:59
-#: actions/disfavor.php:61
-#: actions/favor.php:64
-#: actions/finishaddopenid.php:67
-#: actions/logout.php:71
-#: actions/newmessage.php:83
-#: actions/newnotice.php:90
-#: actions/nudge.php:63
-#: actions/subedit.php:31
-#: actions/subscribe.php:30
-#: actions/unblock.php:60
-#: actions/unsubscribe.php:27
-#: lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
+#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
+#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30
+#: actions/finishaddopenid.php:29 actions/logout.php:33
+#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
+#: actions/unsubscribe.php:25 lib/deleteaction.php:38
+#: lib/settingsaction.php:27 actions/block.php:59 actions/disfavor.php:61
+#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
+#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
+#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
+#: actions/unsubscribe.php:27 lib/deleteaction.php:66
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Non connecté."
 
-#: ../lib/subs.php:91
-#: lib/subs.php:104
-#: lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Pas abonné !"
 
-#: ../actions/opensearch.php:35
-#: actions/opensearch.php:35
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
 #: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Recherche de statut"
 
-#: ../actions/showstream.php:82
-#: actions/showstream.php:82
-#: actions/showstream.php:180
-#: actions/showstream.php:187
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:180 actions/showstream.php:187
 #: actions/showstream.php:192
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Flux des statuts de %s"
 
-#: ../actions/shownotice.php:39
-#: actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Le statut n'a pas de profil"
 
-#: ../actions/showstream.php:316
-#: actions/showstream.php:331
-#: actions/showstream.php:504
-#: lib/facebookaction.php:477
-#: lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Statuts"
 
-#: ../actions/tag.php:35
-#: ../actions/tag.php:81
-#: actions/tag.php:35
-#: actions/tag.php:81
-#: actions/tag.php:41
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Statuts marqués avec %s"
 
-#: ../actions/password.php:39
-#: actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: ../lib/settingsaction.php:96
-#: ../lib/util.php:314
-#: lib/settingsaction.php:90
-#: lib/util.php:330
-#: lib/accountsettingsaction.php:116
-#: lib/action.php:341
-#: lib/logingroupnav.php:81
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "Configuration du compte OpenID"
 
-#: ../lib/openid.php:180
-#: lib/openid.php:180
-#: lib/openid.php:266
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "Soumission automatique OpenID"
 
-#: ../actions/finishaddopenid.php:99
-#: ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
-#: actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146
-#: actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170
-#: actions/openidlogin.php:80
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "Connexion OpenID"
 
-#: ../actions/openidlogin.php:65
-#: ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74
-#: actions/openidsettings.php:50
-#: actions/openidlogin.php:102
-#: actions/openidsettings.php:101
+#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "URL OpenID"
 
-#: ../actions/finishaddopenid.php:42
-#: ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42
-#: actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88
-#: actions/finishopenidlogin.php:130
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
+#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "Authentification OpenID annulée."
 
-#: ../actions/finishaddopenid.php:46
-#: ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46
-#: actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92
-#: actions/finishopenidlogin.php:134
+#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
+#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "L'authentification OpenID a échoué : %s'"
 
-#: ../lib/openid.php:133
-#: lib/openid.php:133
-#: lib/openid.php:142
+#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Erreur OpenID : %s"
 
-#: ../actions/openidsettings.php:144
-#: actions/openidsettings.php:153
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 #: actions/openidsettings.php:231
 msgid "OpenID removed."
 msgstr "OpenID retiré."
 
-#: ../actions/openidsettings.php:37
-#: actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 #: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "Paramètres OpenID"
 
-#: ../actions/invite.php:135
-#: actions/invite.php:143
-#: actions/invite.php:180
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Ajouter un message personnel à l'invitation (optionnel)."
 
-#: ../actions/avatar.php:84
-#: actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Transfert partiel."
 
-#: ../actions/finishopenidlogin.php:90
-#: ../actions/login.php:102
-#: ../actions/register.php:153
-#: ../lib/settingsaction.php:93
-#: actions/finishopenidlogin.php:96
-#: actions/login.php:102
-#: actions/register.php:167
-#: actions/finishopenidlogin.php:118
-#: actions/login.php:231
-#: actions/register.php:372
-#: lib/accountsettingsaction.php:110
-#: lib/facebookaction.php:311
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
+#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: actions/finishopenidlogin.php:96 actions/login.php:102
+#: actions/register.php:167 actions/finishopenidlogin.php:118
+#: actions/login.php:231 actions/register.php:372
+#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../actions/recoverpassword.php:288
-#: actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Le mot de passe et sa confirmation ne correspondent pas."
 
-#: ../actions/recoverpassword.php:284
-#: actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Le mot de passe doit contenir au moins 6 caractères."
 
-#: ../actions/recoverpassword.php:261
-#: ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267
-#: actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199
-#: actions/recoverpassword.php:301
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Récupération de mot de passe demandée"
 
-#: ../actions/password.php:89
-#: ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408
-#: actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173
-#: actions/recoverpassword.php:200
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Mot de passe enregistré."
 
-#: ../actions/password.php:61
-#: ../actions/register.php:88
-#: actions/profilesettings.php:380
-#: actions/register.php:98
-#: actions/passwordsettings.php:145
-#: actions/register.php:183
+#: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
+#: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Les mots de passe ne correspondent pas."
 
-#: ../lib/searchaction.php:100
-#: lib/searchaction.php:100
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Personnes"
 
-#: ../actions/opensearch.php:33
-#: actions/opensearch.php:33
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Recherche de personnes"
 
-#: ../actions/peoplesearch.php:33
-#: actions/peoplesearch.php:33
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 #: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Recherche de personnes"
 
-#: ../lib/stream.php:50
-#: lib/personal.php:50
-#: lib/personalgroupnav.php:98
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Personnel"
 
-#: ../actions/invite.php:133
-#: actions/invite.php:141
-#: actions/invite.php:178
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Message personnel"
 
-#: ../actions/smssettings.php:69
-#: actions/smssettings.php:69
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Numéro de téléphone, sans ponctuation ni espaces, incluant le code régional"
+msgstr ""
+"Numéro de téléphone, sans ponctuation ni espaces, incluant le code régional"
 
 #: ../actions/userauthorization.php:78
-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 \"Cancel\"."
-msgstr "Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous abonner aux statuts de cet utilisateur. Si vous n'avez pas demandé à vous abonner aux statuts de quelqu'un, cliquez \"Annuler\"."
+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 \"Cancel\"."
+msgstr ""
+"Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous "
+"abonner aux statuts de cet utilisateur. Si vous n'avez pas demandé à vous "
+"abonner aux statuts de quelqu'un, cliquez \"Annuler\"."
 
-#: ../actions/imsettings.php:73
-#: actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Publier un statut chaque fois que mon statut est modifié dans Jabber/GTalk"
-
-#: ../actions/emailsettings.php:85
-#: ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
-#: actions/emailsettings.php:86
-#: actions/imsettings.php:68
-#: actions/smssettings.php:94
-#: actions/twittersettings.php:70
-#: actions/emailsettings.php:147
-#: actions/imsettings.php:133
-#: actions/smssettings.php:157
-#: actions/twittersettings.php:134
+msgstr ""
+"Publier un statut chaque fois que mon statut est modifié dans Jabber/GTalk"
+
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../actions/emailsettings.php:162
-#: ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
-#: actions/emailsettings.php:180
-#: actions/imsettings.php:152
-#: actions/smssettings.php:171
-#: actions/emailsettings.php:286
-#: actions/imsettings.php:258
-#: actions/othersettings.php:168
-#: actions/smssettings.php:272
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Préférences enregistrées"
 
-#: ../actions/profilesettings.php:57
-#: actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Langue préférée"
 
-#: ../lib/util.php:328
-#: lib/util.php:344
-#: lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: ../classes/Notice.php:95
-#: ../classes/Notice.php:106
-#: classes/Notice.php:109
-#: classes/Notice.php:119
-#: classes/Notice.php:145
-#: classes/Notice.php:155
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Problème lors de l'enregistrement du statut."
 
-#: ../lib/settingsaction.php:84
-#: ../lib/stream.php:60
-#: lib/personal.php:60
-#: lib/settingsaction.php:84
-#: lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profil"
 
-#: ../actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "URL du profil"
 
-#: ../actions/profilesettings.php:34
-#: actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Paramètres du profil"
 
-#: ../actions/postnotice.php:51
-#: ../actions/updateprofile.php:52
-#: actions/postnotice.php:52
-#: actions/updateprofile.php:53
-#: actions/postnotice.php:55
-#: actions/updateprofile.php:56
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
+#: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Profil inconnu"
 
-#: ../actions/public.php:54
-#: actions/public.php:54
-#: actions/public.php:124
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Fil du flux public"
 
-#: ../actions/public.php:33
-#: actions/public.php:33
-#: actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Flux public"
 
-#: ../actions/imsettings.php:79
-#: actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
 
-#: ../actions/emailsettings.php:94
-#: actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publier un MicroID pour mon adresse courriel."
 
-#: ../actions/tag.php:75
-#: ../actions/tag.php:76
-#: actions/tag.php:75
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
 msgid "Recent Tags"
 msgstr "Marquages récents"
 
-#: ../actions/recoverpassword.php:166
-#: actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Récupérer"
 
-#: ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Récupérer le mot de passe"
 
-#: ../actions/recoverpassword.php:67
-#: actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "Code de récupération d'un utilisateur inconnu."
 
-#: ../actions/register.php:142
-#: ../actions/register.php:193
-#: ../lib/util.php:312
-#: actions/register.php:152
-#: actions/register.php:207
-#: lib/util.php:328
-#: actions/register.php:69
-#: actions/register.php:436
-#: lib/action.php:338
-#: lib/facebookaction.php:277
-#: lib/logingroupnav.php:78
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: actions/register.php:69 actions/register.php:436 lib/action.php:338
+#: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Créer un compte"
 
-#: ../actions/register.php:28
-#: actions/register.php:28
-#: actions/finishopenidlogin.php:196
-#: actions/register.php:90
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Création de compte non autorisée."
 
-#: ../actions/register.php:200
-#: actions/register.php:214
-#: actions/register.php:67
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Compte créé avec succès"
 
-#: ../actions/userauthorization.php:120
-#: actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Refuser"
 
-#: ../actions/login.php:103
-#: ../actions/register.php:176
-#: actions/login.php:103
-#: actions/register.php:190
-#: actions/login.php:234
-#: actions/openidlogin.php:107
-#: actions/register.php:414
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Profil distant sans profil correspondant"
 
-#: ../actions/remotesubscribe.php:65
-#: actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Abonnement à distance "
 
-#: ../actions/emailsettings.php:47
-#: ../actions/emailsettings.php:75
-#: ../actions/imsettings.php:48
-#: ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50
-#: ../actions/smssettings.php:84
-#: actions/emailsettings.php:48
-#: actions/emailsettings.php:76
-#: actions/imsettings.php:49
-#: actions/openidsettings.php:108
-#: actions/smssettings.php:50
-#: actions/smssettings.php:84
-#: actions/twittersettings.php:59
-#: actions/emailsettings.php:101
-#: actions/emailsettings.php:134
-#: actions/imsettings.php:102
-#: actions/openidsettings.php:166
-#: actions/smssettings.php:103
-#: actions/smssettings.php:146
-#: actions/twittersettings.php:115
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/emailsettings.php:101
+#: actions/emailsettings.php:134 actions/imsettings.php:102
+#: actions/openidsettings.php:166 actions/smssettings.php:103
+#: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Retirer "
 
-#: ../actions/openidsettings.php:68
-#: actions/openidsettings.php:69
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 #: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Retirer l'OpenID"
 
-#: ../actions/openidsettings.php:73
-msgid "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first."
-msgstr "Vous ne pourrez plus ouvrir de session si vous retirez votre seul OpenID ! Si vous avez besoin de le retirer, ajoutez d'abord un autre OpenID."
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Vous ne pourrez plus ouvrir de session si vous retirez votre seul OpenID ! "
+"Si vous avez besoin de le retirer, ajoutez d'abord un autre OpenID."
 
-#: ../lib/stream.php:55
-#: lib/personal.php:55
-#: lib/personalgroupnav.php:103
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Réponses"
 
-#: ../actions/replies.php:47
-#: ../actions/repliesrss.php:76
-#: ../lib/stream.php:56
-#: actions/replies.php:47
-#: actions/repliesrss.php:62
-#: lib/personal.php:56
-#: actions/replies.php:116
-#: actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
+#: actions/replies.php:116 actions/repliesrss.php:67
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Réponses à %s"
 
-#: ../actions/recoverpassword.php:183
-#: actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
-#: ../lib/settingsaction.php:99
-#: lib/settingsaction.php:93
-#: actions/subscriptions.php:123
-#: lib/connectsettingsaction.php:107
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
-#: ../actions/smssettings.php:67
-#: actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "Numéro SMS"
 
-#: ../actions/smssettings.php:33
-#: actions/smssettings.php:33
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
 #: actions/smssettings.php:58
 msgid "SMS Settings"
 msgstr "Paramètres SMS"
 
-#: ../lib/mail.php:219
-#: lib/mail.php:225
-#: lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "Confirmation SMS"
 
-#: ../actions/recoverpassword.php:182
-#: actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Identique au mot de passe ci-dessus"
 
-#: ../actions/register.php:156
-#: actions/register.php:170
-#: actions/register.php:377
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
-msgstr ""
-"Identique au mot de passe ci-dessus. Requis."
-
-#: ../actions/emailsettings.php:97
-#: ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67
-#: ../actions/smssettings.php:100
-#: actions/emailsettings.php:104
-#: actions/imsettings.php:82
-#: actions/profilesettings.php:101
-#: actions/smssettings.php:100
-#: actions/twittersettings.php:83
-#: actions/emailsettings.php:182
-#: actions/facebooksettings.php:114
-#: actions/imsettings.php:157
-#: actions/othersettings.php:117
-#: actions/profilesettings.php:150
-#: actions/smssettings.php:169
-#: actions/subscriptions.php:124
-#: actions/tagother.php:152
-#: actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+msgstr "Identique au mot de passe ci-dessus. Requis."
+
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83 actions/emailsettings.php:182
+#: actions/facebooksettings.php:114 actions/imsettings.php:157
+#: actions/othersettings.php:117 actions/profilesettings.php:150
+#: actions/smssettings.php:169 actions/subscriptions.php:124
+#: actions/tagother.php:152 actions/twittersettings.php:161
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../lib/searchaction.php:84
-#: ../lib/util.php:300
-#: lib/searchaction.php:84
-#: lib/util.php:316
-#: lib/action.php:325
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../actions/noticesearch.php:80
-#: actions/noticesearch.php:85
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 #: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Rechercher dans le flux de recherche"
 
-#: ../actions/noticesearch.php:30
-#: actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:57 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 "Recherchez les statuts %%site.name%% par leur contenu. Séparez les termes de recherche par des espaces. Ils doivent contenir au moins 3 caractères."
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Recherchez les statuts %%site.name%% par leur contenu. Séparez les termes de "
+"recherche par des espaces. Ils doivent contenir au moins 3 caractères."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 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 "Recherchez des personnes dans %%site.name%% par leur nom, leur emplacement ou leurs intérêts. Séparez les termes de recherche par des espaces. Ils doivent contenir au moins 3 caractères."
+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 ""
+"Recherchez des personnes dans %%site.name%% par leur nom, leur emplacement "
+"ou leurs intérêts. Séparez les termes de recherche par des espaces. Ils "
+"doivent contenir au moins 3 caractères."
 
-#: ../actions/smssettings.php:296
-#: actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Sélectionnez un fournisseur de téléphone mobile"
 
-#: ../actions/invite.php:137
-#: ../lib/util.php:1172
-#: actions/invite.php:145
-#: lib/util.php:1306
-#: lib/util.php:1731
-#: actions/invite.php:182
-#: lib/messageform.php:167
-#: lib/noticeform.php:177
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Envoyer"
 
-#: ../actions/emailsettings.php:73
-#: ../actions/smssettings.php:82
-#: actions/emailsettings.php:74
-#: actions/smssettings.php:82
-#: actions/emailsettings.php:132
-#: actions/smssettings.php:145
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+#: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Écrivez à cette adresse courriel pour publier de nouveaux statuts. "
 
-#: ../actions/emailsettings.php:88
-#: actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
-msgstr ""
-"Avertissez-moi par courriel des nouveaux abonnements."
+msgstr "Avertissez-moi par courriel des nouveaux abonnements."
 
-#: ../actions/imsettings.php:70
-#: actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envoyez-moi les statuts par Jabber/GTalk."
 
-#: ../actions/smssettings.php:97
-#: actions/smssettings.php:97
-msgid "Send me notices through SMS; I understand I may incur exorbitant charges from my carrier."
-msgstr "Envoyez-moi les statuts par SMS ; je comprends que cela pourrait affecter ma facture de téléphonie mobile."
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Envoyez-moi les statuts par SMS ; je comprends que cela pourrait affecter ma "
+"facture de téléphonie mobile."
 
-#: ../actions/imsettings.php:76
-#: actions/imsettings.php:77
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Envoyez-moi par Jabber/GTalk les réponses des personnes auxquelles je ne suis pas abonné."
+"Envoyez-moi par Jabber/GTalk les réponses des personnes auxquelles je ne "
+"suis pas abonné."
 
-#: ../lib/util.php:304
-#: lib/util.php:320
-#: lib/facebookaction.php:215
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Préférences"
 
-#: ../actions/profilesettings.php:192
-#: actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Préférences enregistrées."
 
-#: ../actions/tag.php:60
-#: actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
 msgstr "Marquages les plus populaires des 7 derniers jours"
 
-#: ../actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:66
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 #: actions/finishaddopenid.php:114
 msgid "Someone else already has this OpenID."
 msgstr "Quelqu'un utilise déjà cet OpenID."
 
-#: ../actions/finishopenidlogin.php:42
-#: ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47
-#: actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52
-#: actions/openidsettings.php:202
+#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
+#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
 msgid "Something weird happened."
 msgstr "Quelque chose de bizarre est arrivé."
 
-#: ../scripts/maildaemon.php:58
-#: scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Désolé, la réception de courriels n'est pas permise. "
 
-#: ../scripts/maildaemon.php:54
-#: scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
-msgstr ""
-"Désolé, ceci n'est pas votre adresse de courriel entrant."
+msgstr "Désolé, ceci n'est pas votre adresse de courriel entrant."
 
-#: ../lib/util.php:330
-#: lib/util.php:346
-#: lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Source"
 
-#: ../actions/showstream.php:296
-#: actions/showstream.php:311
-#: actions/showstream.php:476
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: ../actions/finishopenidlogin.php:182
-#: ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188
-#: actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222
-#: actions/finishopenidlogin.php:290
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "OpenID non trouvé."
 
-#: ../actions/remotesubscribe.php:75
-#: ../actions/showstream.php:188
-#: ../actions/showstream.php:197
-#: actions/remotesubscribe.php:84
-#: actions/showstream.php:197
-#: actions/showstream.php:206
-#: actions/remotesubscribe.php:113
-#: actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+#: actions/remotesubscribe.php:113 actions/showstream.php:376
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "S'abonner"
 
-#: ../actions/showstream.php:313
-#: ../actions/subscribers.php:27
-#: actions/showstream.php:328
-#: actions/subscribers.php:27
-#: actions/showstream.php:436
-#: actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:436 actions/showstream.php:498
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abonnés"
 
-#: ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Abonnement autorisé"
 
-#: ../actions/userauthorization.php:320
-#: actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Abonnement refusé"
 
-#: ../actions/showstream.php:230
-#: ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
-#: actions/showstream.php:240
-#: actions/showstream.php:322
-#: actions/subscriptions.php:27
-#: actions/showstream.php:407
-#: actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
+#: actions/showstream.php:407 actions/showstream.php:489
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abonnements"
 
-#: ../actions/avatar.php:87
-#: actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Erreur système lors du transfert du fichier."
 
-#: ../actions/tag.php:41
-#: ../lib/util.php:301
-#: actions/tag.php:41
-#: lib/util.php:317
-#: actions/profilesettings.php:122
-#: actions/showstream.php:297
-#: actions/tagother.php:147
-#: actions/tagother.php:207
-#: lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
+#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Marquages"
 
-#: ../lib/searchaction.php:104
-#: lib/searchaction.php:104
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Texte"
 
-#: ../actions/noticesearch.php:34
-#: actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Recherche de texte"
 
-#: ../actions/openidsettings.php:140
-#: actions/openidsettings.php:149
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 #: actions/openidsettings.php:227
 msgid "That OpenID does not belong to you."
 msgstr "Cet OpenID ne vous appartient pas."
 
-#: ../actions/confirmaddress.php:52
-#: actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 #: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "Cette adresse a déjà été confirmée."
 
-#: ../actions/confirmaddress.php:43
-#: actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 #: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr "Ce code de confirmation n'est pas pour vous !"
 
-#: ../actions/emailsettings.php:191
-#: actions/emailsettings.php:209
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
-msgstr ""
-"Cette adresse courriel appartient déjà à un autre utilisateur."
+msgstr "Cette adresse courriel appartient déjà à un autre utilisateur."
 
-#: ../actions/avatar.php:80
-#: actions/profilesettings.php:317
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
 #: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Ce fichier est trop gros."
 
-#: ../actions/imsettings.php:170
-#: actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Vous utilisez déjà cet idenfiant Jabber."
 
-#: ../actions/emailsettings.php:188
-#: actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
-msgstr ""
-"Vous utilisez déjà cette adresse courriel."
+msgstr "Vous utilisez déjà cette adresse courriel."
 
-#: ../actions/smssettings.php:188
-#: actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
-msgstr ""
-"Vous utilisez déjà ce numéro de téléphone."
+msgstr "Vous utilisez déjà ce numéro de téléphone."
 
-#: ../actions/imsettings.php:233
-#: actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Ceci n'est pas votre identifiant Jabber."
 
-#: ../actions/emailsettings.php:249
-#: actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
-msgstr ""
-"Ceci n'est pas votre adresse courriel."
+msgstr "Ceci n'est pas votre adresse courriel."
 
-#: ../actions/smssettings.php:257
-#: actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
-msgstr ""
-"Ceci n'est pas votre numéro de téléphone."
+msgstr "Ceci n'est pas votre numéro de téléphone."
 
-#: ../actions/emailsettings.php:226
-#: ../actions/imsettings.php:210
-#: actions/emailsettings.php:244
-#: actions/imsettings.php:218
-#: actions/emailsettings.php:367
-#: actions/imsettings.php:349
+#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Cette adresse de messagerie instantanée est erronée."
 
-#: ../actions/smssettings.php:233
-#: actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
-msgstr ""
-"Ce code de confirmation est incorrect."
+msgstr "Ce code de confirmation est incorrect."
 
-#: ../actions/smssettings.php:191
-#: actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
-msgstr ""
-"Ce numéro de téléphone est déjà utilisé."
-
-#: ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243
-#: actions/twitapistatuses.php:276
+msgstr "Ce numéro de téléphone est déjà utilisé."
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères."
 
-#: ../actions/twitapiaccount.php:74
-#: actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "C'est trop long ! Vous n'avez droit qu'à 255 caractères."
 
-#: ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'adresse \"%s\" a été validée pour votre compte."
 
-#: ../actions/emailsettings.php:264
-#: ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
-#: actions/emailsettings.php:282
-#: actions/imsettings.php:258
-#: actions/smssettings.php:282
-#: actions/emailsettings.php:416
-#: actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "L'adresse a été supprimée."
 
-#: ../actions/userauthorization.php:312
-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 "L'abonnement a été autorisé, mais l'URL de rappel n'a pas été validé. Vérifiez les instructions du site pour savoir comment compléter l'autorisation de l'abonnement. Votre jeton d'abonnement est :"
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
+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 ""
+"L'abonnement a été autorisé, mais l'URL de rappel n'a pas été validé. "
+"Vérifiez les instructions du site pour savoir comment compléter "
+"l'autorisation de l'abonnement. Votre jeton d'abonnement est :"
 
-#: ../actions/userauthorization.php:322
-msgid "The subscription has been rejected, but no callback URL was passed. Check with the site's instructions for details on how to fully reject the subscription."
-msgstr "L'abonnement a été refusé, mais l'URL de rappel n'a pas été validé. Vérifiez les instructions du site pour savoir comment refuser pleinement l'abonnement. "
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site's instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"L'abonnement a été refusé, mais l'URL de rappel n'a pas été validé. Vérifiez "
+"les instructions du site pour savoir comment refuser pleinement "
+"l'abonnement. "
 
-#: ../actions/subscribers.php:35
-#: actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Ces personnes suivent les statuts de %s."
 
-#: ../actions/subscribers.php:33
-#: actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Ces personnes suivent vos statuts. "
 
-#: ../actions/subscriptions.php:35
-#: actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Les statuts de ces personnes sont suivis par %s."
 
-#: ../actions/subscriptions.php:33
-#: actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Vous suivez les statuts de ces personnes. "
 
-#: ../actions/invite.php:89
-#: actions/invite.php:96
-#: actions/invite.php:128
-msgid "These people are already users and you were automatically subscribed to them:"
+#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
 msgstr "Vous avez été automatiquement abonné aux utilisateurs suivants :"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Ce code de validation est périmé. Veuillez recommencer. "
 
-#: ../lib/openid.php:195
-msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider."
-msgstr "Ce formulaire devrait se transmettre automatiquement. Si ce n'est pas le cas, cliquez sur le bouton de soumission pour accéder à votre fournisseur OpenID."
-
-#: ../actions/finishopenidlogin.php:56
-#: actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, php-format
-msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one."
-msgstr "C'est votre première ouverture de session dans %s, et nous devons relier votre OpenID à un compte local. Vous pouvez soit créer un nouveau compte, soit relier votre OpenID à un compte existant."
-
-#: ../actions/twitapifriendships.php:108
-#: ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127
-#: actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-#: actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85
-#: actions/twitapistatuses.php:436
+#: ../lib/openid.php:195 lib/openid.php:206
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Ce formulaire devrait se transmettre automatiquement. Si ce n'est pas le "
+"cas, cliquez sur le bouton de soumission pour accéder à votre fournisseur "
+"OpenID."
+
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your OpenID "
+"to a local account. You can either create a new account, or connect with "
+"your existing account, if you have one."
+msgstr ""
+"C'est votre première ouverture de session dans %s, et nous devons relier "
+"votre OpenID à un compte local. Vous pouvez soit créer un nouveau compte, "
+"soit relier votre OpenID à un compte existant."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
+#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Ce processus requiert un POST ou un DELETE."
 
-#: ../actions/twitapiaccount.php:65
-#: ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-#: actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114
-#: actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-#: actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122
-#: actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
+#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Ce processus requiert un POST."
 
-#: ../lib/util.php:164
-#: lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
-msgstr "Cette page n'est pas disponible dans un des formats que vous avez autorisés."
+msgstr ""
+"Cette page n'est pas disponible dans un des formats que vous avez autorisés."
 
-#: ../actions/profilesettings.php:63
-#: actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: ../actions/profilesettings.php:107
-#: actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Aucun fuseau horaire n'a été choisi."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: 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 "Pour vous abonner, vous devez [ouvrir une session](%%action.login%%), ou [créer un nouveau compte](%%action.register%%). Si vous avez déjà un compte sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l'URL de votre profil ci-dessous."
-
-#: ../actions/twitapifriendships.php:163
-#: actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+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 ""
+"Pour vous abonner, vous devez [ouvrir une session](%%action.login%%), ou "
+"[créer un nouveau compte](%%action.register%%). Si vous avez déjà un compte "
+"sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l'URL "
+"de votre profil ci-dessous."
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Vous devez fournir 2 identifiants ou pseudos."
 
-#: ../actions/profilesettings.php:48
-#: ../actions/register.php:169
-#: actions/profilesettings.php:81
-#: actions/register.php:183
-#: actions/profilesettings.php:109
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site"
 
-#: ../actions/remotesubscribe.php:74
-#: actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
 
-#: ../actions/emailsettings.php:130
-#: ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39
-#: ../actions/smssettings.php:135
-#: actions/emailsettings.php:144
-#: actions/imsettings.php:118
-#: actions/recoverpassword.php:39
-#: actions/smssettings.php:143
-#: actions/twittersettings.php:108
-#: actions/avatarsettings.php:258
-#: actions/emailsettings.php:242
-#: actions/grouplogo.php:317
-#: actions/imsettings.php:214
-#: actions/recoverpassword.php:44
-#: actions/smssettings.php:236
-#: actions/twittersettings.php:302
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/avatarsettings.php:258
+#: actions/emailsettings.php:242 actions/grouplogo.php:317
+#: actions/imsettings.php:214 actions/recoverpassword.php:44
+#: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
 
-#: ../actions/recoverpassword.php:276
-#: actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Réinitialisation inattendue du mot de passe."
 
-#: ../index.php:57
-#: index.php:57
-#: actions/recoverpassword.php:202
+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Action inconnue"
 
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
-#: actions/finishremotesubscribe.php:61
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
 msgstr "Version inconnue du protocole OMB"
 
-#: ../lib/util.php:269
-#: lib/util.php:285
-msgid "Unless otherwise specified, contents of this site are copyright by the contributors and available under the "
-msgstr "Sauf précision contraire, les contenus de ce site sont la propriété de leurs auteurs et sont disponibles sous"
+#: ../lib/util.php:269 lib/util.php:285
+msgid ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
+msgstr ""
+"Sauf précision contraire, les contenus de ce site sont la propriété de leurs "
+"auteurs et sont disponibles sous"
 
-#: ../actions/confirmaddress.php:48
-#: actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Type d'adresse non reconnu : %s"
 
-#: ../actions/showstream.php:209
-#: actions/showstream.php:219
+#: ../actions/showstream.php:209 actions/showstream.php:219
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Désabonnement"
 
-#: ../actions/postnotice.php:44
-#: ../actions/updateprofile.php:45
-#: actions/postnotice.php:45
-#: actions/updateprofile.php:46
-#: actions/postnotice.php:48
-#: actions/updateprofile.php:49
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
+#: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Version de OMB non supportée"
 
-#: ../actions/avatar.php:105
-#: actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Format de fichier d'image non supporté."
 
-#: ../lib/settingsaction.php:100
-#: lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Suivi des statuts par SMS"
 
-#: ../lib/settingsaction.php:103
-#: lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Suivi des statuts par messagerie instantanée"
 
-#: ../actions/twitapistatuses.php:241
-#: actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Statuts de %1$s et ses amis dans %2$s!"
 
-#: ../actions/twitapistatuses.php:341
-#: actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Statuts de %1$s dans %2$s!"
 
-#: ../actions/avatar.php:68
-#: actions/profilesettings.php:161
-#: actions/avatarsettings.php:162
-#: actions/grouplogo.php:232
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Transfert"
 
 #: ../actions/avatar.php:27
-msgid "Upload a new \"avatar\" (user image) here. You can't edit the picture after you upload it, so make sure it's more or less square. It must be under the site license, also. Use a picture that belongs to you and that you want to share."
-msgstr "Ajoutez un nouvel « avatar » (votre image d'utilisateur). Vous ne pouvez modifier l'image après l'envoi, alors faites en sorte qu'elle soit plus ou moins carrée. Elle doit aussi être compatible avec la licence d'utilisation du site ; utilisez de préférence une image qui vous appartient et que vous voulez partager."
+msgid ""
+"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
+"you upload it, so make sure it's more or less square. It must be under the "
+"site license, also. Use a picture that belongs to you and that you want to "
+"share."
+msgstr ""
+"Ajoutez un nouvel « avatar » (votre image d'utilisateur). Vous ne pouvez "
+"modifier l'image après l'envoi, alors faites en sorte qu'elle soit plus ou "
+"moins carrée. Elle doit aussi être compatible avec la licence d'utilisation "
+"du site ; utilisez de préférence une image qui vous appartient et que vous "
+"voulez partager."
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
-msgstr ""
-"Ajouter une nouvelle image pour le profil"
+msgstr "Ajouter une nouvelle image pour le profil"
 
-#: ../actions/invite.php:114
-#: actions/invite.php:121
-#: actions/invite.php:154
-msgid "Use this form to invite your friends and colleagues to use this service."
-msgstr "Remplissez ce formulaire pour inviter vos amis et collègues à utiliser ce service."
+#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Remplissez ce formulaire pour inviter vos amis et collègues à utiliser ce "
+"service."
 
-#: ../actions/register.php:159
-#: ../actions/register.php:162
-#: actions/register.php:173
-#: actions/register.php:176
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
-msgstr "Utilisé uniquement pour les mises à jour de statut, les avertissements, et la récupération de mot de passe"
+msgstr ""
+"Utilisé uniquement pour les mises à jour de statut, les avertissements, et "
+"la récupération de mot de passe"
 
 #: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
-#: actions/finishremotesubscribe.php:94
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
 msgstr "L'utilisateur suivi n'existe pas."
 
-#: ../actions/all.php:41
-#: ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47
-#: ../actions/replies.php:41
-#: ../actions/showstream.php:44
-#: ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319
-#: ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
-#: actions/all.php:41
-#: actions/avatarbynickname.php:48
-#: actions/foaf.php:47
-#: actions/replies.php:41
-#: actions/showfavorites.php:41
-#: actions/showstream.php:44
-#: actions/twitapiaccount.php:80
-#: actions/twitapifavorites.php:68
-#: actions/twitapistatuses.php:235
-#: actions/twitapistatuses.php:609
-#: actions/twitapiusers.php:87
-#: lib/mailbox.php:50
-#: actions/avatarbynickname.php:80
-#: actions/foaf.php:48
-#: actions/replies.php:80
-#: actions/showstream.php:107
-#: actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42
-#: actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503
-#: actions/twitapiusers.php:55
-#: actions/usergroups.php:99
-#: lib/galleryaction.php:67
-#: lib/twitterapi.php:626
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:47 ../actions/replies.php:41
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
+#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50
+#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
+#: actions/showstream.php:107 actions/twitapiaccount.php:70
+#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
+#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
+#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Aucun profil ne correspond à cet utilisateur."
 
-#: ../actions/remotesubscribe.php:71
-#: actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Pseudo de l'utilisateur"
 
-#: ../actions/twitapiusers.php:75
-#: actions/twitapiusers.php:80
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
 msgstr "Utilisateur non trouvé."
 
-#: ../actions/profilesettings.php:63
-#: actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "Quel est votre fuseau horaire habituel ?"
 
-#: ../lib/util.php:1159
-#: lib/util.php:1293
-#: lib/noticeform.php:141
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Quoi de neuf, %s ?"
 
-#: ../actions/profilesettings.php:54
-#: ../actions/register.php:175
-#: actions/profilesettings.php:87
-#: actions/register.php:189
-#: actions/profilesettings.php:119
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Indiquez votre emplacement, ex.: \"Ville, État (ou région), Pays\""
 
-#: ../actions/updateprofile.php:128
-#: actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Format d'image invalide pour '%s'"
 
-#: ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Dimensions d'image invalides pour '%s'"
 
-#: ../actions/deletenotice.php:63
-#: ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64
-#: actions/deletenotice.php:79
-#: actions/block.php:148
-#: actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:148 actions/deletenotice.php:122
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Oui"
 
-#: ../actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:64
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 #: actions/finishaddopenid.php:112
 msgid "You already have this OpenID!"
 msgstr "Vous utilisez déjà cet OpenID !"
 
-#: ../actions/deletenotice.php:37
-#: actions/deletenotice.php:37
-msgid "You are about to permanently delete a notice.  Once this is done, it cannot be undone."
-msgstr "Ce message va être définitivement supprimé. Il sera impossible de le récupérer."
+#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
+msgid ""
+"You are about to permanently delete a notice.  Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Ce message va être définitivement supprimé. Il sera impossible de le "
+"récupérer."
 
-#: ../actions/recoverpassword.php:31
-#: actions/recoverpassword.php:31
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
 msgstr "Votre session est déjà ouverte !"
 
-#: ../actions/invite.php:81
-#: actions/invite.php:88
-#: actions/invite.php:120
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Vous êtes déjà abonné à ces utilisateurs :"
 
-#: ../actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "Vous n'êtes pas ami(e) avec l'utilisateur spécifié."
 
@@ -3354,58 +3078,66 @@ msgstr "Vous n'êtes pas ami(e) avec l'utilisateur spécifié."
 msgid "You can change your password here. Choose a good one!"
 msgstr "Vous pouvez modifier ici votre mot de passe. Choisissez-en un bon !"
 
-#: ../actions/register.php:135
-#: actions/register.php:145
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Créez un nouveau compte pour commencer à envoyer des messages."
 
-#: ../actions/smssettings.php:28
-#: actions/smssettings.php:28
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
 #: actions/smssettings.php:69
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Vous pouvez recevoir des messages SMS par courriel en provenance de %%site.name%%."
-
-#: ../actions/openidsettings.php:86
-msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"."
-msgstr "Vous pouvez retirer un OpenID de votre compte en cliquant sur le bouton « Retirer »."
-
-#: ../actions/imsettings.php:28
-#: actions/imsettings.php:28
-#, php-format
-msgid "You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below."
-msgstr "Vous pouvez envoyer et recevoir des messages via [la messagerie instantanée](%%doc.im%%) Jabber/GTalk. Configurez votre adresse et vos paramètres ci-dessous."
-
-#: ../actions/profilesettings.php:27
-msgid "You can update your personal profile info here so people know more about you."
-msgstr "Vous pouvez mettre à jour les informations de votre profil pour qu'on en sache plus à votre sujet."
-
-#: ../actions/finishremotesubscribe.php:31
-#: ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31
-#: actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33
-#: actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101
-#: actions/remotesubscribe.php:35
+msgstr ""
+"Vous pouvez recevoir des messages SMS par courriel en provenance de %%site."
+"name%%."
+
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Vous pouvez retirer un OpenID de votre compte en cliquant sur le bouton « "
+"Retirer »."
+
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Vous pouvez envoyer et recevoir des messages via [la messagerie instantanée]"
+"(%%doc.im%%) Jabber/GTalk. Configurez votre adresse et vos paramètres ci-"
+"dessous."
+
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Vous pouvez mettre à jour les informations de votre profil pour qu'on en "
+"sache plus à votre sujet."
+
+#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
+#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Vous pouvez utiliser l'abonnement local."
 
-#: ../actions/finishopenidlogin.php:33
-#: ../actions/register.php:61
-#: actions/finishopenidlogin.php:38
-#: actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Vous devez accepter les termes de la licence pour créer un compte."
 
-#: ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Vous n'avez pas envoyé ce profil"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -3417,7 +3149,8 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
-"Une nouvelle adresse vous a été attribuée pour publier vos statuts dans %1$s.\n"
+"Une nouvelle adresse vous a été attribuée pour publier vos statuts dans %1"
+"$s.\n"
 "\n"
 "Écrivez à %2$s pour mettre à jour votre statut.\n"
 "\n"
@@ -3426,223 +3159,217 @@ msgstr ""
 "Amicalement vôtre,\n"
 "%4$s"
 
-#: ../actions/twitapistatuses.php:612
-#: actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Vous ne pouvez pas supprimer le statut d'un autre utilisateur."
 
-#: ../actions/invite.php:31
-#: actions/invite.php:31
-#: actions/invite.php:39
+#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
-msgstr "Vous devez ouvrir une session pour inviter d'autres utilisateurs dans %s"
+msgstr ""
+"Vous devez ouvrir une session pour inviter d'autres utilisateurs dans %s"
 
-#: ../actions/invite.php:103
-#: actions/invite.php:110
-#: actions/invite.php:142
-msgid "You will be notified when your invitees accept the invitation and register on the site. Thanks for growing the community!"
-msgstr "Un avertissement vous sera envoyé quand vos invités auront accepté votre invitation et se seront inscrits sur le site. Merci de faire grandir notre communauté !"
+#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
+"Un avertissement vous sera envoyé quand vos invités auront accepté votre "
+"invitation et se seront inscrits sur le site. Merci de faire grandir notre "
+"communauté !"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
-msgstr "Vous avez été identifié(e) avec succès. Veuillez entrer votre nouveau mot de passe ci-dessous."
+msgstr ""
+"Vous avez été identifié(e) avec succès. Veuillez entrer votre nouveau mot de "
+"passe ci-dessous."
 
-#: ../actions/openidlogin.php:67
-#: actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "Votre URL OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
-msgstr "Votre pseudo sur ce serveur, ou l'adresse courriel que vous avez enregistrée."
+msgstr ""
+"Votre pseudo sur ce serveur, ou l'adresse courriel que vous avez enregistrée."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user account.  Manage your associated OpenIDs from here."
-msgstr "[OpenID](%%doc.openid%%) vous permet de vous connecter à différents sites avec le même compte utilisateur. Gérez vos OpenID associés à partir d'ici."
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
+"account.  Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) vous permet de vous connecter à différents sites "
+"avec le même compte utilisateur. Gérez vos OpenID associés à partir d'ici."
 
-#: ../lib/util.php:943
-#: lib/util.php:992
-#: lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "il y a quelques secondes "
 
-#: ../lib/util.php:955
-#: lib/util.php:1004
-#: lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "il y a %d jours"
 
-#: ../lib/util.php:951
-#: lib/util.php:1000
-#: lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "il y a %d heures"
 
-#: ../lib/util.php:947
-#: lib/util.php:996
-#: lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "il y a %d minutes"
 
-#: ../lib/util.php:959
-#: lib/util.php:1008
-#: lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "il y a %d mois"
 
-#: ../lib/util.php:953
-#: lib/util.php:1002
-#: lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "il y a 1 jour"
 
-#: ../lib/util.php:945
-#: lib/util.php:994
-#: lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "il y a 1 minute"
 
-#: ../lib/util.php:957
-#: lib/util.php:1006
-#: lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "il y a 1 mois"
 
-#: ../lib/util.php:961
-#: lib/util.php:1010
-#: lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "il y a environ 1 an"
 
-#: ../lib/util.php:949
-#: lib/util.php:998
-#: lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "il y a 1 heure"
 
-#: ../actions/showstream.php:423
-#: ../lib/stream.php:132
-#: actions/showstream.php:441
-#: lib/stream.php:99
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
 msgstr "supprimer"
 
-#: ../actions/noticesearch.php:130
-#: ../actions/showstream.php:408
-#: ../lib/stream.php:117
-#: actions/noticesearch.php:136
-#: actions/showstream.php:426
-#: lib/stream.php:84
-#: actions/noticesearch.php:187
+#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
+#: ../lib/stream.php:117 actions/noticesearch.php:136
+#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
 msgid "in reply to..."
 msgstr "en réponse à..."
 
-#: ../actions/noticesearch.php:137
-#: ../actions/showstream.php:415
-#: ../lib/stream.php:124
-#: actions/noticesearch.php:143
-#: actions/showstream.php:433
-#: lib/stream.php:91
-#: actions/noticesearch.php:194
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "répondre"
 
-#: ../actions/password.php:44
-#: actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "identique au mot de passe ci-dessus"
 
-#: ../actions/twitapistatuses.php:755
-#: actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
-msgstr ""
-"type de fichier non supporté"
+msgstr "type de fichier non supporté"
 
-#: ../lib/util.php:1309
-#: lib/util.php:1443
+#: ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
 msgstr "« Après"
 
-#: actions/deletenotice.php:74
-#: actions/disfavor.php:43
-#: actions/emailsettings.php:127
-#: actions/favor.php:45
-#: actions/finishopenidlogin.php:33
-#: actions/imsettings.php:105
-#: actions/invite.php:46
-#: actions/newmessage.php:45
-#: actions/openidlogin.php:36
-#: actions/openidsettings.php:123
-#: actions/profilesettings.php:47
-#: actions/recoverpassword.php:282
-#: actions/register.php:42
-#: actions/remotesubscribe.php:40
-#: actions/smssettings.php:124
-#: actions/subscribe.php:44
-#: actions/twittersettings.php:97
-#: actions/unsubscribe.php:41
-#: actions/userauthorization.php:35
-#: actions/block.php:64
-#: actions/disfavor.php:74
-#: actions/favor.php:77
-#: actions/finishopenidlogin.php:38
-#: actions/invite.php:54
-#: actions/nudge.php:80
-#: actions/openidlogin.php:37
-#: actions/recoverpassword.php:316
-#: actions/subscribe.php:46
-#: actions/unblock.php:65
-#: actions/unsubscribe.php:43
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
+#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
+#: actions/openidlogin.php:37 actions/recoverpassword.php:316
+#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
-msgstr "Un problème est survenu avec votre jeton de session. Veuillez essayer à nouveau."
+msgstr ""
+"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
+"nouveau."
 
-#: actions/disfavor.php:55
-#: actions/disfavor.php:81
+#: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "Ce statut n'est pas un favori !"
 
-#: actions/disfavor.php:63
-#: actions/disfavor.php:87
+#: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Impossible de supprimer le favori."
 
-#: actions/disfavor.php:72
-#: lib/favorform.php:140
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
 msgstr "Ajouter à mes favoris"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Envoyez-moi un courriel quand un utilisateur ajoute un de mes statuts à ses favoris."
+msgstr ""
+"Envoyez-moi un courriel quand un utilisateur ajoute un de mes statuts à ses "
+"favoris."
 
-#: actions/emailsettings.php:95
-#: actions/emailsettings.php:163
+#: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie un message personnel."
 
-#: actions/favor.php:53
-#: actions/twitapifavorites.php:142
-#: actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Ce statut a déjà été ajouté à vos favoris !"
 
-#: actions/favor.php:60
-#: actions/twitapifavorites.php:151
-#: classes/Command.php:132
-#: actions/favor.php:86
-#: actions/twitapifavorites.php:125
-#: classes/Command.php:152
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Impossible de créer le favori."
 
@@ -3650,39 +3377,36 @@ msgstr "Impossible de créer le favori."
 msgid "Disfavor"
 msgstr "Retirer des favoris"
 
-#: actions/favoritesrss.php:60
-#: actions/showfavorites.php:47
-#: actions/favoritesrss.php:100
-#: actions/showfavorites.php:77
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "Statuts favoris de %s"
 
-#: actions/favoritesrss.php:64
-#: actions/favoritesrss.php:104
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Fil des statuts favoris de %s"
 
-#: actions/inbox.php:28
-#: actions/inbox.php:59
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr "Boîte de réception de %s - page %d"
 
-#: actions/inbox.php:30
-#: actions/inbox.php:62
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr "Boîte de réception de %s"
 
-#: actions/inbox.php:53
-#: actions/inbox.php:115
+#: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Cette boîte de réception regroupe les messages personnels qui vous sont envoyés."
+msgstr ""
+"Cette boîte de réception regroupe les messages personnels qui vous sont "
+"envoyés."
 
-#: actions/invite.php:178
-#: actions/invite.php:213
+#: actions/invite.php:178 actions/invite.php:213
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3691,209 +3415,203 @@ msgstr ""
 "%1$s vous invite à vous inscrire à %2$s (%3$s).\n"
 "\n"
 
-#: actions/login.php:104
-#: actions/login.php:235
-#: actions/openidlogin.php:108
+#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
 msgid "Automatically login in the future; "
 msgstr "Ouvrez automatiquement une session à l'avenir ;"
 
-#: actions/login.php:122
-#: actions/login.php:264
+#: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
 msgstr "Pour des raisons de sécurité, veuillez entrer à nouveau votre "
 
-#: actions/login.php:126
-#: actions/login.php:268
+#: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
 msgstr "Entrez votre identifiant et votre mot de passe."
 
-#: actions/newmessage.php:58
-#: actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères."
 
-#: actions/newmessage.php:65
-#: actions/newmessage.php:128
+#: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Aucun destinataire n'a été spécifié."
 
-#: actions/newmessage.php:68
-#: actions/newmessage.php:113
-#: classes/Command.php:206
-#: actions/newmessage.php:131
-#: actions/newmessage.php:168
-#: classes/Command.php:237
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206 actions/newmessage.php:131
+#: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
 
-#: actions/newmessage.php:71
-#: actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
-#: actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid "Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "N'envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..."
-
-#: actions/newmessage.php:108
-#: actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"N'envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..."
+
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "Utilisateur inexistant"
 
-#: actions/newmessage.php:117
-#: actions/newmessage.php:67
+#: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nouveau message"
 
-#: actions/noticesearch.php:95
-#: actions/noticesearch.php:146
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
 msgstr "Message sans profil correspondant"
 
-#: actions/openidsettings.php:28
-#: actions/openidsettings.php:70
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr "[OpenID](%%doc.openid%%) permet de vous connecter à de nombreux sites "
 
-#: actions/openidsettings.php:46
-#: actions/openidsettings.php:96
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
-msgstr "Si vous ne souhaitez pas ajouter un identifiant OpenID à votre compte, "
+msgstr ""
+"Si vous ne souhaitez pas ajouter un identifiant OpenID à votre compte, "
 
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "C'est votre seul identifiant OpenID ; si vous le supprimez, vous ne pourrez plus vous identifier !"
+msgstr ""
+"C'est votre seul identifiant OpenID ; si vous le supprimez, vous ne pourrez "
+"plus vous identifier !"
 
-#: actions/openidsettings.php:87
-#: actions/openidsettings.php:143
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
 msgstr "Vous pouvez retirer un identifiant OpenID de votre compte "
 
-#: actions/outbox.php:28
-#: actions/outbox.php:58
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Boîte d'envoi de %s - page %d"
 
-#: actions/outbox.php:30
-#: actions/outbox.php:61
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Boîte d'envoi de %s"
 
-#: actions/outbox.php:53
-#: actions/outbox.php:116
+#: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
-msgstr "Cette boîte d'envoi regroupe les messages personnels que vous avez envoyés."
+msgstr ""
+"Cette boîte d'envoi regroupe les messages personnels que vous avez envoyés."
 
-#: actions/peoplesearch.php:28
-#: actions/peoplesearch.php:52
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
-msgid "Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Recherchez des utilisateurs de %%site.name%% par nom, par emplacement, ou par intérêts. "
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+"Recherchez des utilisateurs de %%site.name%% par nom, par emplacement, ou "
+"par intérêts. "
 
-#: actions/profilesettings.php:27
-#: actions/profilesettings.php:69
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
 msgid "You can update your personal profile info here "
 msgstr "Vous pouvez mettre votre profil à jour ici  "
 
-#: actions/profilesettings.php:115
-#: actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159
-#: actions/userrss.php:76
-#: actions/avatarsettings.php:104
-#: actions/avatarsettings.php:179
-#: actions/grouplogo.php:177
-#: actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176
-#: actions/userrss.php:82
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
+#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
+#: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Utilisateur sans profil correspondant"
 
-#: actions/recoverpassword.php:91
-#: actions/recoverpassword.php:97
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
 msgstr "Ce code de validation est périmé."
 
-#: actions/recoverpassword.php:141
-#: actions/recoverpassword.php:152
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
 msgstr "Si vous avez oublié ou perdu votre "
 
-# Entrez un : masculin ou féminin ? De quoi s'agit-il ? Contexte ?
-#: actions/recoverpassword.php:154
-#: actions/recoverpassword.php:158
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
 msgstr "Vous avez été identifié(e) avec succès. Entrez un "
 
-#: actions/recoverpassword.php:169
-#: actions/recoverpassword.php:188
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
 msgstr "Votre pseudo sur ce serveur, "
 
-#: actions/recoverpassword.php:271
-#: actions/recoverpassword.php:304
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
 msgstr "Instructions pour récupérer votre mot de passe"
 
-#: actions/recoverpassword.php:327
-#: actions/recoverpassword.php:361
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
 msgstr "Votre nouveau mot de passe a été enregistré avec succès."
 
-#: actions/register.php:95
-#: actions/register.php:180
+#: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Votre mot de passe doit contenir au moins 6 caractères."
 
 #: actions/register.php:216
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to..."
-msgstr "Félicitations, %s ! Bienvenue dans %%%%site.name%%%%. Plusieurs choix s'offrent maintenant à vous :"
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+"Félicitations, %s ! Bienvenue dans %%%%site.name%%%%. Plusieurs choix "
+"s'offrent maintenant à vous :"
 
 #: actions/register.php:227
 msgid "(You should receive a message by email momentarily, with "
 msgstr "(Vous recevrez sous peu un courriel avec "
 
-#: actions/remotesubscribe.php:51
-#: actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
 msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "Pour vous abonner, vous pouvez [login](%%action.login%%), "
 
-#: actions/showfavorites.php:61
-#: actions/showfavorites.php:145
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Fil des favoris de %s"
 
-#: actions/showfavorites.php:84
-#: actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202
-#: actions/twitapifavorites.php:59
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Impossible d'afficher les favoris."
 
-#: actions/showmessage.php:33
-#: actions/showmessage.php:81
+#: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
 msgstr "Message introuvable."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
-msgstr "Ce message personnel ne peut être lu que par son expéditeur et son destinataire."
+msgstr ""
+"Ce message personnel ne peut être lu que par son expéditeur et son "
+"destinataire."
 
-#: actions/showmessage.php:61
-#: actions/showmessage.php:108
+#: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Message adressé à %1$s le %2$s"
 
-#: actions/showmessage.php:66
-#: actions/showmessage.php:113
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Message reçu de %1$s le %2$s"
@@ -3902,72 +3620,83 @@ msgstr "Message reçu de %1$s le %2$s"
 msgid "Send a message"
 msgstr "Envoyer un message"
 
-#: actions/smssettings.php:312
-#: actions/smssettings.php:464
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
 msgstr "Votre fournisseur de téléphone mobile."
 
-#: actions/twitapidirect_messages.php:76
-#: actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Messages envoyés à %s"
 
-#: actions/twitapidirect_messages.php:77
-#: actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Tous les messages envoyés à %s"
 
-#: actions/twitapidirect_messages.php:81
-#: actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Messages envoyés"
 
-#: actions/twitapidirect_messages.php:82
-#: actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Tous les messages envoyés par %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Message sans texte !"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Destinataire non trouvé."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Vous ne pouvez envoyer des messages personnels qu'aux utilisateurs inscrits comme amis."
+msgstr ""
+"Vous ne pouvez envoyer des messages personnels qu'aux utilisateurs inscrits "
+"comme amis."
 
-#: actions/twitapifavorites.php:92
-#: actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoris de %s"
 
-#: actions/twitapifavorites.php:95
-#: actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s statuts ont été ajoutés aux favoris de %s / %s."
 
-#: actions/twitapifavorites.php:187
-#: lib/mail.php:275
-#: actions/twitapifavorites.php:164
-#: lib/mail.php:553
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s a ajouté un de vos messages à ses favoris"
 
-#: actions/twitapifavorites.php:188
-#: lib/mail.php:276
+#: actions/twitapifavorites.php:188 lib/mail.php:276
 #: actions/twitapifavorites.php:165
 #, php-format
 msgid ""
@@ -3978,21 +3707,24 @@ msgstr ""
 "\n"
 
 #: actions/twittersettings.php:27
-msgid "Add your Twitter account to automatically send your notices to Twitter, "
-msgstr "Inscrivez votre compte Twitter pour transférer automatiquement vos statuts vers Twitter, "
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+"Inscrivez votre compte Twitter pour transférer automatiquement vos statuts "
+"vers Twitter, "
 
-#: actions/twittersettings.php:41
-#: actions/twittersettings.php:60
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Préférences Twitter"
 
-#: actions/twittersettings.php:48
-#: actions/twittersettings.php:105
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Votre compte Twitter"
 
-#: actions/twittersettings.php:56
-#: actions/twittersettings.php:113
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Compte Twitter actuellement utilisé."
 
@@ -4000,8 +3732,8 @@ msgstr "Compte Twitter actuellement utilisé."
 msgid "Twitter Username"
 msgstr "Identifiant Twitter"
 
-#: actions/twittersettings.php:65
-#: actions/twittersettings.php:123
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Veuillez éviter les espaces."
 
@@ -4009,244 +3741,239 @@ msgstr "Veuillez éviter les espaces."
 msgid "Twitter Password"
 msgstr "Mot de passe Twitter"
 
-#: actions/twittersettings.php:72
-#: actions/twittersettings.php:139
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Envoyer automatiquement mes statuts dans Twitter."
 
-#: actions/twittersettings.php:75
-#: actions/twittersettings.php:146
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Envoyer mes réponses locales \"@\" dans Twitter."
 
-#: actions/twittersettings.php:78
-#: actions/twittersettings.php:153
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
-msgstr "Je veux m'abonner à mes amis de Twitter qui ont enregistré un compte ici."
+msgstr ""
+"Je veux m'abonner à mes amis de Twitter qui ont enregistré un compte ici."
 
-#: actions/twittersettings.php:122
-msgid "Username must have only numbers, upper- and lowercase letters, and underscore (_). 15 chars max."
-msgstr "L'identifiant ne doit pas dépasser 15 caractères, et ne peut contenir que des chiffres, des lettres minuscules ou majuscules, et des barres de soulignement (_). "
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+"L'identifiant ne doit pas dépasser 15 caractères, et ne peut contenir que "
+"des chiffres, des lettres minuscules ou majuscules, et des barres de "
+"soulignement (_). "
 
-#: actions/twittersettings.php:128
-#: actions/twittersettings.php:334
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "La vérification de vos informations de Twitter a échoué !"
 
 #: actions/twittersettings.php:137
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Impossible de récupérer l'information du compte de \"%s\" dans Twitter."
+msgstr ""
+"Impossible de récupérer l'information du compte de \"%s\" dans Twitter."
 
-#: actions/twittersettings.php:151
-#: actions/twittersettings.php:170
-#: actions/twittersettings.php:348
-#: actions/twittersettings.php:368
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "L'enregistrement de votre configuration Twitter a échoué !"
 
-#: actions/twittersettings.php:174
-#: actions/twittersettings.php:376
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Configuration Twitter enregistrée avec succès."
 
-#: actions/twittersettings.php:192
-#: actions/twittersettings.php:395
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Ce compte Twitter ne vous appartient pas."
 
-#: actions/twittersettings.php:200
-#: actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "Impossible de retirer cet utilisateur de Twitter."
 
-#: actions/twittersettings.php:212
-#: actions/twittersettings.php:407
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Le compte Twitter a été retiré."
 
-#: actions/twittersettings.php:225
-#: actions/twittersettings.php:239
-#: actions/twittersettings.php:428
-#: actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:428 actions/twittersettings.php:439
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "Impossible d'enregistrer vos préférences Twitter."
 
-#: actions/twittersettings.php:245
-#: actions/twittersettings.php:461
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Préférences Twitter enregistrées avec succès."
 
-#: actions/userauthorization.php:84
-#: actions/userauthorization.php:86
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
 msgstr "Veuillez vérifier ces informations pour vous assurer que "
 
-# we are missing context here
-#: actions/userauthorization.php:324
-#: actions/userauthorization.php:340
-#, fuzzy
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
-msgstr "L'abonnement a été autorisé, mais pas "
+msgstr "L’abonnement a été autorisé, mais pas "
 
-# missing context
-#: actions/userauthorization.php:334
-#: actions/userauthorization.php:351
-#, fuzzy
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
-msgstr "L'abonnement a été refusé, mais pas "
+msgstr "L’abonnement a été refusé, mais pas "
 
-#: classes/Channel.php:113
-#: classes/Channel.php:132
-#: classes/Channel.php:151
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Résultats de la commande"
 
-#: classes/Channel.php:148
-#: classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Commande complétée"
 
-#: classes/Channel.php:158
-#: classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Échec de la commande"
 
-#: classes/Command.php:39
-#: classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Désolé, cette commande n'a pas encore été implémantée."
 
-#: classes/Command.php:96
-#: classes/Command.php:113
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
 msgstr "Abonnements : %1$s\n"
 
-#: classes/Command.php:125
-#: classes/Command.php:242
-#: classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "Aucun statut récent pour cet utilisateur"
 
-#: classes/Command.php:146
-#: classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Statut ajouté aux favoris."
 
-#: classes/Command.php:166
-#: classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169
-#: classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nom complet : %s"
 
-#: classes/Command.php:172
-#: classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Emplacement : %s"
 
-#: classes/Command.php:175
-#: classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site Web : %s"
 
-#: classes/Command.php:178
-#: classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "À propos : %s"
 
-#: classes/Command.php:200
-#: classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Message trop long ! La taille maximale est de 140 caractères ; vous en avez entré %d."
+msgstr ""
+"Message trop long ! La taille maximale est de 140 caractères ; vous en avez "
+"entré %d."
 
-#: classes/Command.php:214
-#: classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Votre message a été envoyé à %s"
 
-#: classes/Command.php:216
-#: classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Une erreur est survenue pendant l'envoi de votre message."
 
-#: classes/Command.php:263
-#: classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Indiquez le nom de l'utilisateur auquel vous souhaitez vous abonner "
 
-# could it be plural?
-#: classes/Command.php:270
-#: classes/Command.php:307
-#, fuzzy
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Abonné à %s"
 
-#: classes/Command.php:288
-#: classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Indiquez le nom de l'utilisateur duquel vous souhaitez vous désabonner"
 
-#: classes/Command.php:295
-#: classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Désabonné de %s"
 
-#: classes/Command.php:310
-#: classes/Command.php:330
-#: classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Cette commande n'a pas encore été implémantée."
 
-#: classes/Command.php:313
-#: classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Avertissements désactivés."
 
-#: classes/Command.php:315
-#: classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "Impossible de désactiver les avertissements."
 
-#: classes/Command.php:333
-#: classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Avertissements activés."
 
-#: classes/Command.php:335
-#: classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Impossible d'activer les avertissements."
 
-#: classes/Command.php:344
-#: classes/Command.php:392
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
 msgstr "Commandes : \n"
 
-#: classes/Message.php:53
-#: classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "Impossible d'insérer le message."
 
-#: classes/Message.php:63
-#: classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "Impossible de mettre à jour le message avec un nouvel URI."
 
@@ -4254,8 +3981,7 @@ msgstr "Impossible de mettre à jour le message avec un nouvel URI."
 msgid "User without matching profile in system."
 msgstr "Utilisateur sans profil correspondant dans le système."
 
-#: lib/mail.php:147
-#: lib/mail.php:289
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -4264,14 +3990,12 @@ msgstr ""
 "Vous avez une nouvelle adresse pour publier vos statuts dans %1$s.\n"
 "\n"
 
-#: lib/mail.php:249
-#: lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "Nouveau message personnel de %s"
 
-#: lib/mail.php:253
-#: lib/mail.php:512
+#: lib/mail.php:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -4280,75 +4004,73 @@ msgstr ""
 "%1$s (%2$s) vous a envoyé un message personnel :\n"
 "\n"
 
-#: lib/mailbox.php:43
-#: lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "L'accès à cette boîte de réception est réservé à son utilisateur."
 
-#: lib/openid.php:195
-#: lib/openid.php:203
+#: lib/openid.php:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
 msgstr "Ce formulaire devrait être soumis automatiquement."
 
-#: lib/personal.php:65
-#: lib/personalgroupnav.php:113
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Favoris"
 
-#: lib/personal.php:66
-#: lib/personalgroupnav.php:114
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Statuts favoris de %s"
 
-#: lib/personal.php:66
-#: lib/personalgroupnav.php:114
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Utilisateur"
 
-#: lib/personal.php:75
-#: lib/personalgroupnav.php:123
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: lib/personal.php:76
-#: lib/personalgroupnav.php:124
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Vos messages reçus"
 
-#: lib/personal.php:80
-#: lib/personalgroupnav.php:128
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Boîte d'envoi"
 
-#: lib/personal.php:81
-#: lib/personalgroupnav.php:129
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Vos messages envoyés"
 
-#: lib/settingsaction.php:99
-#: lib/connectsettingsaction.php:110
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
 msgstr "Twitter"
 
-#: lib/settingsaction.php:100
-#: lib/connectsettingsaction.php:111
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr "Configuration Twitter"
 
-#: lib/util.php:1718
-#: lib/messageform.php:139
-#: lib/noticelist.php:422
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "À "
 
-#: scripts/maildaemon.php:45
-#: scripts/maildaemon.php:48
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "Impossible de déchiffrer ce message."
 
-#: actions/all.php:63
-#: actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s et ses amis - page %d"
@@ -4357,92 +4079,85 @@ msgstr "%s et ses amis - page %d"
 msgid "You can upload your personal avatar."
 msgstr "Vous pouvez associer un « avatar » (image personnelle) à votre profil."
 
-#: actions/avatarsettings.php:117
-#: actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Paramètres de l'avatar"
 
-#: actions/avatarsettings.php:124
-#: actions/avatarsettings.php:199
-#: actions/grouplogo.php:198
-#: actions/grouplogo.php:258
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Image originale"
 
-#: actions/avatarsettings.php:139
-#: actions/avatarsettings.php:211
-#: actions/grouplogo.php:209
-#: actions/grouplogo.php:270
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Aperçu"
 
-#: actions/avatarsettings.php:225
-#: actions/grouplogo.php:284
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Recadrer"
 
-#: actions/avatarsettings.php:248
-#: actions/deletenotice.php:133
-#: actions/emailsettings.php:224
-#: actions/grouplogo.php:307
-#: actions/imsettings.php:200
-#: actions/login.php:102
-#: actions/newmessage.php:100
-#: actions/newnotice.php:96
-#: actions/openidsettings.php:188
-#: actions/othersettings.php:136
-#: actions/passwordsettings.php:131
-#: actions/profilesettings.php:172
-#: actions/register.php:113
-#: actions/remotesubscribe.php:53
-#: actions/smssettings.php:216
-#: actions/subedit.php:38
-#: actions/twittersettings.php:290
+#: actions/avatarsettings.php:248 actions/deletenotice.php:133
+#: actions/emailsettings.php:224 actions/grouplogo.php:307
+#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
+#: actions/newnotice.php:96 actions/openidsettings.php:188
+#: actions/othersettings.php:136 actions/passwordsettings.php:131
+#: actions/profilesettings.php:172 actions/register.php:113
+#: actions/remotesubscribe.php:53 actions/smssettings.php:216
+#: actions/subedit.php:38 actions/twittersettings.php:290
 #: actions/userauthorization.php:39
 msgid "There was a problem with your session token. "
 msgstr "Un problème est survenu avec vos informations de session. "
 
-#: actions/avatarsettings.php:303
-#: actions/grouplogo.php:360
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
 
-#: actions/avatarsettings.php:327
-#: actions/grouplogo.php:384
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Données perdues."
 
-#: actions/avatarsettings.php:334
-#: actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "Fichier perdu."
 
-#: actions/avatarsettings.php:349
-#: actions/avatarsettings.php:383
-#: actions/grouplogo.php:406
-#: actions/grouplogo.php:440
-#: classes/User_group.php:129
-#: classes/User_group.php:161
+#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
+#: actions/grouplogo.php:406 actions/grouplogo.php:440
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
-msgstr ""
-"Type de fichier inconnu"
+msgstr "Type de fichier inconnu"
 
-#: actions/block.php:69
-#: actions/subedit.php:46
-#: actions/unblock.php:70
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "Aucun profil n'a été spécifié."
 
-#: actions/block.php:74
-#: actions/subedit.php:53
-#: actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "Aucun profil ne correspond à cet identifiant."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Bloquer cet utilisateur"
 
@@ -4450,11 +4165,11 @@ msgstr "Bloquer cet utilisateur"
 msgid "Are you sure you want to block this user? "
 msgstr "Êtes-vous sûr(e) de bloquer cet utilisateur ?"
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Vous avez déjà bloqué cet utilisateur."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "Impossible d'enregistrer les informations de blocage."
 
@@ -4471,81 +4186,84 @@ msgstr "Ce statut va être définitivement supprimé. "
 msgid "Add to favorites"
 msgstr "Ajouter aux favoris"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Modifier le groupe %s"
 
-#: actions/editgroup.php:66
-#: actions/groupbyid.php:72
-#: actions/grouplogo.php:66
-#: actions/joingroup.php:60
-#: actions/newgroup.php:65
-#: actions/showgroup.php:100
+#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
+#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
-msgstr "Les boîtes de réception doivent être activées pour que les groupes fonctionnent "
+msgstr ""
+"Les boîtes de réception doivent être activées pour que les groupes "
+"fonctionnent "
 
-#: actions/editgroup.php:71
-#: actions/grouplogo.php:71
-#: actions/newgroup.php:70
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Vous devez ouvrir une session pour créer un groupe."
 
-#: actions/editgroup.php:87
-#: actions/grouplogo.php:87
-#: actions/groupmembers.php:76
-#: actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/editgroup.php:87 actions/grouplogo.php:87
+#: actions/groupmembers.php:76 actions/joingroup.php:81
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "Aucun pseudo"
 
-#: actions/editgroup.php:99
-#: actions/groupbyid.php:88
-#: actions/grouplogo.php:100
-#: actions/groupmembers.php:83
-#: actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
+#: actions/groupmembers.php:83 actions/joingroup.php:88
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "Aucun groupe trouvé"
 
-#: actions/editgroup.php:106
-#: actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/editgroup.php:106 actions/editgroup.php:165
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Seuls les administrateurs d'un groupe peuvent le modifier."
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Remplissez ce formulaire pour modifier les options du groupe."
 
-#: actions/editgroup.php:179
-#: actions/newgroup.php:130
-#: actions/register.php:156
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
 msgid "Nickname must have only lowercase letters "
 msgstr "Le pseudo ne peut contenir que des caractères minuscules "
 
-#: actions/editgroup.php:198
-#: actions/newgroup.php:149
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "la description est trop longue (140 caractères maximum)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "Impossible de mettre à jour le groupe."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "Vos options ont été enregistrées."
 
-#: actions/emailsettings.php:107
-#: actions/imsettings.php:108
+#: actions/emailsettings.php:107 actions/imsettings.php:108
 #, php-format
 msgid "Awaiting confirmation on this address. "
 msgstr "En attente de confirmation de cette adresse."
 
-# using the infinitive form here?
-#: actions/emailsettings.php:139
-#: actions/smssettings.php:150
+#: actions/emailsettings.php:139 actions/smssettings.php:150
 msgid "Make a new email address for posting to; "
 msgstr "Créer une nouvelle adresse courriel pour publier vos statuts ; "
 
@@ -4553,90 +4271,94 @@ msgstr "Créer une nouvelle adresse courriel pour publier vos statuts ; "
 msgid "Send me email when someone "
 msgstr "Envoyez-moi un courriel quand quelqu'un "
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Autoriser mes amis à m'envoyer des courriels et des clins d'oeil."
 
-# Missing context
 #: actions/emailsettings.php:321
-#, fuzzy
 msgid "That email address already belongs "
-msgstr ""
-"Cette adresse courriel appartient déjà "
+msgstr "Cette adresse électronique appartient déjà "
 
 #: actions/emailsettings.php:343
 msgid "A confirmation code was sent to the email address you added. "
 msgstr "Un code de confirmation a été envoyé à l'adresse courriel indiquée."
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "Erreur du serveur - impossible d'accéder à cet utilisateur !"
 
 #: actions/facebookhome.php:196
 #, php-format
 msgid "If you would like the %s app to automatically update "
-msgstr "Si vous souhaitez que l'application %s soit mise à jour automatiquement "
+msgstr ""
+"Si vous souhaitez que l'application %s soit mise à jour automatiquement "
 
-#: actions/facebookhome.php:213
-#: actions/facebooksettings.php:137
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, php-format
 msgid "Allow %s to update my Facebook status"
 msgstr "Autoriser %s à mettre à jour mon statut dans Facebook"
 
-# context???
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Sauter"
 
-# i originally put 'aucun statut!' here, but the original translation seems better
-#: actions/facebookhome.php:235
-#, fuzzy
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
-msgstr "Statut sans contenu!"
+msgstr "Statut sans contenu !"
 
-#: actions/facebookhome.php:295
-#: lib/action.php:870
-#: lib/facebookaction.php:399
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Pagination"
 
-#: actions/facebookhome.php:304
-#: lib/action.php:879
-#: lib/facebookaction.php:408
+#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "Après"
 
-#: actions/facebookhome.php:312
-#: lib/action.php:887
-#: lib/facebookaction.php:416
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "Avant"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Merci d'inviter vos amis à utiliser %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "Invitation(s) envoyée(s) aux personnes suivantes :"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "Vous avez reçu une invitation à %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr "Invitez vos amis dans %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Amis déjà inscrits à %s :"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Envoyer des invitations"
@@ -4647,7 +4369,9 @@ msgstr "Impossible de retirer l'utilisateur Facebook."
 
 #: actions/facebooksettings.php:65
 msgid "There was a problem saving your sync preferences!"
-msgstr "Un problème est survenu lors de l'enregistrement de vos préférences de synchronisation !"
+msgstr ""
+"Un problème est survenu lors de l'enregistrement de vos préférences de "
+"synchronisation !"
 
 #: actions/facebooksettings.php:67
 msgid "Sync preferences saved."
@@ -4678,14 +4402,14 @@ msgstr "Si vous souhaitez une mise à jour automatique de %s "
 msgid "Sync preferences"
 msgstr "Préférences de synchronisation"
 
-#: actions/favor.php:94
-#: lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Retirer ce favori"
 
-#: actions/favorited.php:65
-#: lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Statuts populaires"
 
@@ -4698,9 +4422,9 @@ msgstr "Statuts populaires - page %d"
 msgid "The most popular notices on the site right now."
 msgstr "Statuts les plus populaires sur le site en ce moment."
 
-#: actions/featured.php:69
-#: lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Utilisateurs en vedette"
 
@@ -4714,16 +4438,17 @@ msgstr "Utilisateurs en vedette - page %d"
 msgid "A selection of some of the great users on %s"
 msgstr "Les utilisateurs à ne pas manquer dans %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Cet utilisateur vous a empêché de vous inscrire."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "Aucun identifiant"
 
-#: actions/grouplogo.php:138
-#: actions/grouplogo.php:191
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Logo du groupe"
 
@@ -4731,16 +4456,17 @@ msgstr "Logo du groupe"
 msgid "You can upload a logo image for your group."
 msgstr "Choisissez un logo pour votre groupe."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Logo mis à jour."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "La mise à jour du logo a échoué."
 
-#: actions/groupmembers.php:93
-#: lib/groupnav.php:91
+#: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
 msgid "%s group members"
 msgstr "Membres du groupe %s"
@@ -4754,10 +4480,9 @@ msgstr "Membres du groupe %s - page %d"
 msgid "A list of the users in this group."
 msgstr "Liste des utilisateurs inscrits à ce groupe."
 
-#: actions/groups.php:62
-#: actions/showstream.php:518
-#: lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Groupes"
 
@@ -4766,105 +4491,110 @@ msgstr "Groupes"
 msgid "Groups, page %d"
 msgstr "Groupes - page %d"
 
-# missing context
 #: actions/groups.php:90
-#, fuzzy
 #, php-format
 msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "Les groupes %%%%site.name%%%% vous permettent d'échanger avec "
 
-#: actions/groups.php:106
-#: actions/usergroups.php:124
-#: lib/groupeditform.php:123
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "Créer un nouveau groupe"
 
 #: actions/groupsearch.php:57
 #, php-format
-msgid "Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Recherchez des groupes dans %%site.name%% par nom, par emplacement ou par intérêts. Séparez les termes de recherches par des espaces. Ils doivent contenir au moins 3 caractères."
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr ""
+"Recherchez des groupes dans %%site.name%% par nom, par emplacement ou par "
+"intérêts. Séparez les termes de recherches par des espaces. Ils doivent "
+"contenir au moins 3 caractères."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Rechercher des groupes"
 
-# missing context
 #: actions/imsettings.php:70
-#, fuzzy
 msgid "You can send and receive notices through "
 msgstr "Vous pouvez publier et lire les statuts via "
 
-# missing context
 #: actions/imsettings.php:120
-#, fuzzy
 #, php-format
 msgid "Jabber or GTalk address, "
 msgstr "Adresse Jabber ou GTalk, "
 
 #: actions/imsettings.php:147
 msgid "Send me replies through Jabber/GTalk "
-msgstr ""
-"Envoyez-moi les réponses par Jabber/GTalk"
+msgstr "Envoyez-moi les réponses par Jabber/GTalk"
 
 #: actions/imsettings.php:321
 #, php-format
 msgid "A confirmation code was sent "
 msgstr "Un code de confirmation a été envoyé "
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "Vous êtes déjà membre de ce groupe "
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Impossible d'inscrire l'utilisateur %s au groupe %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s a rejoint le groupe %s"
 
 #: actions/leavegroup.php:60
 msgid "Inboxes must be enabled for groups to work."
-msgstr "Les boîtes de réception doivent être activées pour que les groupes fonctionnent."
+msgstr ""
+"Les boîtes de réception doivent être activées pour que les groupes "
+"fonctionnent."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Vous devez ouvrir une session pour quitter un groupe."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "Aucun groupe trouvé."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "Vous n'êtes pas membre de ce groupe."
 
 #: actions/leavegroup.php:100
 msgid "You may not leave a group while you are its administrator."
-msgstr "Il est recommandé de ne pas quitter un groupe dont vous êtes administrateur."
+msgstr ""
+"Il est recommandé de ne pas quitter un groupe dont vous êtes administrateur."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr "Aucun enregistrement à ce groupe n'a été trouvé."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Impossible de retirer l'utilisateur %s du groupe %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s a quitté le groupe %s"
 
-#: actions/login.php:225
-#: lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "Ouverture de session"
 
@@ -4876,21 +4606,21 @@ msgstr "Aucun statut "
 msgid "New group"
 msgstr "Nouveau groupe"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :"
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
-msgstr ""
-"Impossible de créer le groupe."
+msgstr "Impossible de créer le groupe."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr "Impossible d'établir l'inscription au groupe."
 
-#: actions/newmessage.php:119
-#: actions/newnotice.php:132
+#: actions/newmessage.php:119 actions/newnotice.php:132
 msgid "That's too long. "
 msgstr "C'est trop long."
 
@@ -4898,19 +4628,23 @@ msgstr "C'est trop long."
 msgid "Don't send a message to yourself; "
 msgstr "N'envoyez pas de message à vous-même ; "
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
-msgstr ""
-"Statut publié"
+msgstr "Statut publié"
 
-#: actions/newnotice.php:200
-#: classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Erreur Ajax"
 
 #: actions/nudge.php:85
-msgid "This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr "Cet utilisateur n'accepte pas les clins d'œil ou n'a pas encore validé son adresse courriel."
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"Cet utilisateur n'accepte pas les clins d'œil ou n'a pas encore validé son "
+"adresse courriel."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -4920,7 +4654,7 @@ msgstr "Clin d'œil envoyé"
 msgid "Nudge sent!"
 msgstr "Clin d'œil envoyé !"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr "Connexion OpenID"
 
@@ -4944,79 +4678,86 @@ msgstr "Réduction automatique des adresses Web (URL)"
 msgid "Service"
 msgstr "Service"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Sélectionnez un service de réduction d'URL."
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr ""
-"Le service de réduction d'URL est trop long (50 caractères maximum)."
+msgstr "Le service de réduction d'URL est trop long (50 caractères maximum)."
 
 #: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Modifier votre mot de passe."
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr "Modification du mot de passe"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
-msgstr ""
-"Ce marquage est invalide : %s"
+msgstr "Ce marquage est invalide : %s"
 
-# can it be plural?
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Utilisateurs marqués &s - page %d"
 
-# can it be plural?
 #: actions/peopletag.php:91
 #, php-format
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Les utilisateurs suivants se sont marqués  \"%s\" :"
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Information de profil"
 
-#: actions/profilesettings.php:124
-msgid "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "Marquages (tags) pour votre profil, séparés par des virgules ou des espaces"
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"Marquages (tags) pour votre profil, séparés par des virgules ou des espaces"
 
-# missing context
 #: actions/profilesettings.php:144
-#, fuzzy
 msgid "Automatically subscribe to whoever "
-msgstr "M'abonner automatiquement à quiconque "
+msgstr "M’abonner automatiquement à quiconque "
 
-#: actions/profilesettings.php:229
-#: actions/tagother.php:176
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Marquage invalide : \"%s\""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "Impossible d'enregistrer les marquages. "
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Flux public - page %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
-msgstr ""
-"Impossible de récupérer le flux public."
+msgstr "Impossible de récupérer le flux public."
 
 #: actions/public.php:220
 #, php-format
-msgid "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
-msgstr "%%site.name%% est un service de [micro-blogging](http://fr.wikipedia.org/wiki/Microblog) "
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+"%%site.name%% est un service de [micro-blogging](http://fr.wikipedia.org/"
+"wiki/Microblog) "
 
 #: actions/publictagcloud.php:57
 #, fuzzy
@@ -5028,60 +4769,51 @@ msgstr "Marquages publics"
 msgid "These are most popular recent tags on %s "
 msgstr "Derniers marquages les plus populaires dans %s "
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 #, fuzzy
 msgid "Tag cloud"
 msgstr "Marquages "
 
-#: actions/register.php:139
-#: actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Désolé ! Seules les personnes invitées peuvent s'inscrire."
 
-# missing context
 #: actions/register.php:149
 #, fuzzy
 msgid "You can't register if you don't "
 msgstr "Vous ne pouvez pas créer un compte si vous ne "
 
-# missing context
 #: actions/register.php:286
 #, fuzzy
 msgid "With this form you can create "
 msgstr "Ce formulaire permet de créer "
 
-# missing context
 #: actions/register.php:368
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, "
 msgstr "1 à 64 lettres minuscules ou chiffres, "
 
-# missing context
-#: actions/register.php:382
-#: actions/register.php:386
+#: actions/register.php:382 actions/register.php:386
 #, fuzzy
 msgid "Used only for updates, announcements, "
 msgstr "Utilisé seulement pour les mises à jour, nouvelles du site, "
 
-# missing context
 #: actions/register.php:398
-#, fuzzy
 msgid "URL of your homepage, blog, "
 msgstr "URL de votre site Web, blogue, "
 
-# missing context
 #: actions/register.php:404
 #, fuzzy
 msgid "Describe yourself and your "
 msgstr "Décrivez qui vous êtes et vos "
 
-# missing context
 #: actions/register.php:410
 #, fuzzy
 msgid "Where you are, like \"City, "
 msgstr "Votre emplacement, ex.: \"Ville, "
 
-# missing context
 #: actions/register.php:432
 #, fuzzy
 msgid " except this private data: password, "
@@ -5092,18 +4824,17 @@ msgstr " à l'exception de ces données personnelles : mot de passe, "
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr "Félicitations, %s ! Bienvenue dans %%%%site.name%%%%. "
 
-# missing context
 #: actions/register.php:495
 #, fuzzy
 msgid "(You should receive a message by email "
 msgstr "(Vous recevrez bientôt un courriel "
 
-#: actions/remotesubscribe.php:166
-#: actions/remotesubscribe.php:171
+#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
 msgid "That's a local profile! Login to subscribe."
 msgstr "Ce profil est local ! Ouvrez une session pour vous abonner."
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Réponses à %s - page %d"
@@ -5113,128 +4844,145 @@ msgstr "Réponses à %s - page %d"
 msgid "%s favorite notices, page %d"
 msgstr "Statuts favoris de %s - page %d"
 
-#: actions/showgroup.php:77
-#: lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Groupe %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Groupe %s - page %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Profil du groupe"
 
-#: actions/showgroup.php:251
-#: actions/showstream.php:278
-#: actions/tagother.php:119
-#: lib/grouplist.php:134
-#: lib/profilelist.php:133
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
-#: actions/showgroup.php:262
-#: actions/showstream.php:289
-#: actions/tagother.php:129
-#: lib/grouplist.php:145
-#: lib/profilelist.php:144
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr "Note"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Actions du groupe"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr "Fil des statuts du groupe %s"
 
-#: actions/showgroup.php:357
-#: lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Membres"
 
-#: actions/showgroup.php:363
-#: actions/showstream.php:413
-#: actions/showstream.php:442
-#: actions/showstream.php:524
-#: lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: actions/showgroup.php:363 actions/showstream.php:413
+#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(aucun)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "Tous les membres"
 
 #: actions/showgroup.php:378
 #, php-format
-msgid "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
-msgstr "**%s** est un groupe d'utilisateurs du service de [micro-blogging](http://fr.wikipedia.org/wiki/Microblog)  %%%%site.name%%%%"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+"**%s** est un groupe d'utilisateurs du service de [micro-blogging](http://fr."
+"wikipedia.org/wiki/Microblog)  %%%%site.name%%%%"
 
-# is there another part to this sentence?
 #: actions/showmessage.php:98
-#, fuzzy
 msgid "Only the sender and recipient "
 msgstr "Expéditeur et destinataire seulement "
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s - page %d"
 
-# missing context
 #: actions/showstream.php:143
 #, fuzzy
 msgid "'s profile"
 msgstr " - Profil"
 
-#: actions/showstream.php:236
-#: actions/tagother.php:77
+#: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "Profil de l'utilisateur"
 
-#: actions/showstream.php:240
-#: actions/tagother.php:81
+#: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Photo"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "Actions de l'utilisateur"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "Envoyer un message à cet utilisateur"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Message "
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "Tous les abonnés"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "Tous les groupes"
 
 #: actions/showstream.php:542
 #, php-format
-msgid "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
-msgstr "**%s** est inscrit au service de [micro-blogging](http://fr.wikipedia.org/wiki/Microblog)  %%%%site.name%%%%"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+"**%s** est inscrit au service de [micro-blogging](http://fr.wikipedia.org/"
+"wiki/Microblog)  %%%%site.name%%%%"
 
-# missing context
 #: actions/smssettings.php:128
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, "
 msgstr "Numéro de téléphone, sans ponctuation ni espace, "
 
-# missing context
 #: actions/smssettings.php:162
 #, fuzzy
 msgid "Send me notices through SMS; "
@@ -5242,9 +4990,10 @@ msgstr "M'envoyer les statuts par SMS ; "
 
 #: actions/smssettings.php:335
 msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Un code de confirmation vient d'être envoyé au numéro de téléphone indiqué. "
+msgstr ""
+"Un code de confirmation vient d'être envoyé au numéro de téléphone indiqué. "
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Fournisseur de téléphonie mobile"
 
@@ -5258,14 +5007,11 @@ msgstr "Impossible d'enregistrer l'abonnement."
 
 #: actions/subscribe.php:55
 msgid "Not a local user."
-msgstr ""
-"Ceci n'est pas un utilisateur local."
+msgstr "Ceci n'est pas un utilisateur local."
 
-# missing context?
 #: actions/subscribe.php:69
-#, fuzzy
 msgid "Subscribed"
-msgstr "Abonné"
+msgstr "Souscrit"
 
 #: actions/subscribers.php:50
 #, php-format
@@ -5277,15 +5023,12 @@ msgstr "Abonnés à %s"
 msgid "%s subscribers, page %d"
 msgstr "Abonnés à %s - page &d"
 
-# missing context
 #: actions/subscribers.php:63
 #, fuzzy
 msgid "These are the people who listen to "
 msgstr "Ces personnes suivent "
 
-# missing context
 #: actions/subscribers.php:67
-#, fuzzy
 #, php-format
 msgid "These are the people who "
 msgstr "Ces personnes sont ceux qui "
@@ -5300,30 +5043,27 @@ msgstr "Abonnements de %s"
 msgid "%s subscriptions, page %d"
 msgstr "Abonnements de %s - page %d"
 
-# missing context
 #: actions/subscriptions.php:65
 #, fuzzy
 msgid "These are the people whose notices "
 msgstr "Voici les personnes dont les messages "
 
-# missing context
 #: actions/subscriptions.php:69
-#, fuzzy
 #, php-format
 msgid "These are the people whose "
 msgstr "Voici les personnes dont "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
-msgstr ""
-"Statuts marqués %s - page %d"
+msgstr "Statuts marqués %s - page %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "Messages marqués \"%s\", à partir du plus récent"
@@ -5345,46 +5085,53 @@ msgstr "Marquage %s"
 msgid "Tag user"
 msgstr "Marquer l'utilisateur"
 
-#: actions/tagother.php:149
-msgid "Tags for this user (letters, numbers, -, ., and _), comma- or space- separated"
+#: actions/tagother.php:149 actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr "Marquer cet utilisateur (séparer par des espaces ou des virgules)"
 
 #: actions/tagother.php:164
 msgid "There was a problem with your session token."
 msgstr "Un problème est survenu avec votre jeton de session."
 
-#: actions/tagother.php:191
-msgid "You can only tag people you are subscribed to or who are subscribed to you."
-msgstr "Vous pouvez seulement marquer les personnes auxquelles vous êtes abonné(e) ou qui sont abonnées à vous."
+#: actions/tagother.php:191 actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+"Vous pouvez seulement marquer les personnes auxquelles vous êtes abonné(e) "
+"ou qui sont abonnées à vous."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
-msgstr ""
-"Impossible d'enregistrer les marquages."
+msgstr "Impossible d'enregistrer les marquages."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr "Remplissez les champs suivants pour marquer vos abonnés ou vos abonnements."
+msgstr ""
+"Remplissez les champs suivants pour marquer vos abonnés ou vos abonnements."
 
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Aucun marquage trouvé."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
-msgstr ""
-"Microblog marqué avec %s"
+msgstr "Microblog marqué avec %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Le blocage de l'utilisateur a échoué."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "Le déblocage de l'utilisateur a échoué."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Non trouvé."
 
@@ -5392,15 +5139,16 @@ msgstr "Non trouvé."
 msgid "Add your Twitter account to automatically send "
 msgstr "Ajoutez votre compte Twitter pour envoyer automatiquement "
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Nom d'utilisateur Twitter"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Mot de passe Twitter"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Amis de Twitter"
 
@@ -5413,153 +5161,160 @@ msgstr "L'identifiant doit contenit seulement des chiffres, "
 msgid "Unable to retrieve account information "
 msgstr "Impossible de récupérer les informations du compte "
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "Erreur lors de l'annulation du blocage."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "Aucune identité de profil dans la requête."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "Aucun profil avec cet identifiant."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Désabonné"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "Groupes de %s"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Groupes de %s - page %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Erreur lors de l'enregistrement du statut. Utilisateur inconnu."
 
-#: classes/Notice.php:109
-msgid "Too many notices too fast; take a breather and post again in a few minutes."
-msgstr "Trop de statuts, trop vite ! Prenez une pause et publiez à nouveau dans quelques minutes."
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+"Trop de statuts, trop vite ! Prenez une pause et publiez à nouveau dans "
+"quelques minutes."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Il vous est interdit de publier des statuts dans ce site."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Ajouter un avatar"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Autres "
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Autres options "
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Page sans nom"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Navigation primaire du site"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Profil personnel et flux des amis"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Rechercher des personnes ou du texte"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Compte"
 
-# missing context
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "Modifier votre courriel, avatar, mot de passe, profil "
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Connexion à la messagerie instantanée, SMS ou Twitter"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Fermer la session"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Ouvrir une session"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Créer un compte"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "Connexion OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "À l'aide !"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr "Notice du site"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "Vues locales"
 
-# missing context?
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "Notice de la page"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Navigation secondaire du site"
 
-#: lib/action.php:602
-#: lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Licence du logiciel StatusNet"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "Tous"
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "licence."
 
-#: lib/blockform.php:123
-#: lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "Bloquer cet utilisateur "
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Bloquer"
 
-#: lib/disfavorform.php:114
-#: lib/disfavorform.php:140
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Retirer des favoris"
 
@@ -5568,20 +5323,18 @@ msgstr "Retirer des favoris"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "Vous devez ouvrir une session pour utiliser l'application Facebook %s"
 
-# missing context?
-#: lib/facebookaction.php:271
-#, fuzzy
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
-msgstr " un nouveau compte."
+msgstr "  un nouveau compte."
 
-#: lib/facebookaction.php:557
-#: lib/mailbox.php:214
-#: lib/noticelist.php:354
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "Publié"
 
-#: lib/favorform.php:114
-#: lib/favorform.php:140
+#: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Ajouter aux favoris"
 
@@ -5589,63 +5342,66 @@ msgstr "Ajouter aux favoris"
 msgid "Export data"
 msgstr "Exporter les données"
 
-# étiquettes ou marquages?
 #: lib/galleryaction.php:121
-#, fuzzy
 msgid "Filter tags"
-msgstr "Filtrer les étiquettes"
+msgstr "Filtrer les balises"
 
 #: lib/galleryaction.php:131
 msgid "All"
 msgstr "Tous"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Marquer"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Choissez un marquage pour réduire la liste"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Aller"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL du site Web ou blogue du groupe ou sujet "
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Description"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Description du groupe ou du sujet (140 caractères maximum)"
 
-#: lib/groupeditform.php:158
-msgid "Location for the group, if any, like \"City, State (or Region), Country\""
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Emplacement du groupe, s'il y a lieu \"Ville, État ou région, Pays\""
 
-#: lib/groupnav.php:84
-#: lib/searchgroupnav.php:84
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Groupe"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "Administrer"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Modifier les propriétés du groupe %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Ajouter ou modifier le logo de %s"
@@ -5663,7 +5419,6 @@ msgstr "Groupes avec le plus d'éléments publiés"
 msgid "Tags in %s group's notices"
 msgstr "Marquages des statuts du groupe %s"
 
-# missing context
 #: lib/htmloutputter.php:104
 #, fuzzy
 msgid "This page is not available in a "
@@ -5677,11 +5432,11 @@ msgstr "Rejoindre"
 msgid "Leave"
 msgstr "Quitter"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Ouvrez une session avec un identifiant et un mot de passe"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Créer un nouveau compte"
 
@@ -5694,35 +5449,35 @@ msgstr "Ouvrir une session ou s'enregistrer avec OpenID"
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr "Bonjour, %s.\n"
+msgstr ""
+"Bonjour, %s.\n"
 "\n"
 
-# missing context
 #: lib/mail.php:236
-#, fuzzy
 #, php-format
 msgid "%1$s is now listening to "
 msgstr "%1$s suit actuellement "
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Emplacement : %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Site Web : %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
-msgstr "Bio : %s\n"
+msgstr ""
+"Bio : %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Vous avez reçu un clin d'œil de %s"
@@ -5737,54 +5492,47 @@ msgstr "%1$s (%2$s) se demande ce que vous devenez  "
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s a ajouté votre statut depuis %2$s"
 
-#: lib/mailbox.php:229
-#: lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "De"
 
-# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
-# Nouveau message\n
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
-# à "Supprimer l'avis"
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Envoyer un message direct"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "Envoyer un statut"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Caractères restants"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "en réponse à"
 
-#: lib/noticelist.php:447
-#: lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Répondre à ce statut"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Répondre"
 
-# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
-# Nouveau message\n
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
-# à "Supprimer l'avis"
-#: lib/noticelist.php:471
-#: lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Supprimer ce statut"
 
-# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
-# Nouveau message\n
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
-# à "Supprimer l'avis"
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -5805,31 +5553,31 @@ msgstr "Envoyer un clin d'œil à cet utilisateur"
 msgid "Tags in %s's notices"
 msgstr "Marquages des statuts de %s"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(aucun)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Public"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Groupes d'utilisateurs"
 
-#: lib/publicgroupnav.php:82
-#: lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Marquages récents"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "En vedette"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
-msgstr ""
-"Populaires"
+msgstr "Populaires"
 
 #: lib/searchgroupnav.php:82
 msgid "Notice"
@@ -5843,32 +5591,33 @@ msgstr "Rechercher des groupes sur ce site"
 msgid "Untitled section"
 msgstr "Section sans titre"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Abonnements de %s"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Abonnés de %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Groupes de %s"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter des amis et collègues à vous rejoindre dans %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Cet utilisateur vous a bloqué."
 
-#: lib/subscribeform.php:115
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "S'abonner à cet utilisateur"
 
@@ -5880,32 +5629,2101 @@ msgstr "Aucun"
 msgid "Top posters"
 msgstr "Utilisateurs les plus actifs"
 
-#: lib/unblockform.php:120
-#: lib/unblockform.php:150
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Débloquer cet utilisateur"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Débloquer"
 
-#: lib/unsubscribeform.php:113
-#: lib/unsubscribeform.php:137
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Ne plus suivre cet utilisateur"
 
-#~ 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 ""
-#~ "Il utilise le logiciel de micro-blogging [StatusNet](http://status.net/), "
-#~ "version %s, disponible sous la licence [GNU Affero General Public "
-#~ "License] (http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Flux pour les amis de %s (RSS 1.0)"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Flux pour les amis de %s (RSS 2.0)"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Flux pour les amis de %s (Atom)"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+msgid "You and friends"
+msgstr "Vous et vos amis"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Vous pouvez associer un « avatar » (image personnelle) à votre profil."
+
+#: actions/avatarsettings.php:373
+msgid "Avatar deleted."
+msgstr "Avatar supprimé."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+"Êtes-vous certain de vouloir bloquer cet utilisateur ? Après cela, il ne "
+"sera plus abonné à votre compte, ne pourra plus s’y abonner de nouveau, et "
+"vous ne serez pas informé des @-réponses de sa part."
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Ce message va être définitivement supprimé. Il sera impossible de le "
+"récupérer."
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
+"nouveau."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie un message personnel."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+"Si vous souhaitez que l’application %s mette automatiquement à jour votre "
+"statut Facebook avec votre dernier message, vous devez lui donner ce droit."
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+"Si vous souhaitez que %s mette automatiquement à jour votre statut Facebook "
+"avec votre dernier message, vous devez lui donner ce droit."
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Choisissez un logo pour votre groupe."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Micro-blogging par %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Recherchez des personnes dans %%site.name%% par leur nom, leur emplacement "
+"ou leurs intérêts. Séparez les termes de recherche par des espaces. Ils "
+"doivent contenir au moins 3 caractères."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr "Seuls les utilisateurs connectés peuvent envoyer des messages directs."
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Flux de recherche pour « %s »"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
+"votre mot de passe afin d'enregistrer vos préférences."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Fil du flux public"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Fil du flux public"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Fil du flux public"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+"Vous êtes sur %%site.name%% un service de [microblog] (http://fr.wikipedia."
+"org/wiki/Microblog) basé sur le logiciel libre [StatusNet](http://status."
+"net/). [Inscrivez-vous](%%action.register%%) pour partager des messages sur "
+"vous avec vos amis, famille et collègues ! ([Plus d’informations](%%doc.help%"
+"%))"
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr "Creative Commons Paternité 3.0"
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"à l'exception de ces données personnelles : mot de passe, adresse e-mail, "
+"adresse de messagerie instantanée, numéro de téléphone. "
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr "Créé"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+msgid "Your profile"
+msgstr "Votre profil"
+
+#: actions/showstream.php:149
+#, php-format
+msgid "%s's profile"
+msgstr "Profil de %s"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Flux des statuts de %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Flux des statuts de %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Flux des statuts de %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Boîte d'envoi de %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+msgid "Edit Avatar"
+msgstr "Modifier l'avatar"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+msgid "Edit profile settings"
+msgstr "Modifier les paramètres du profil"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr "Modifier"
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Un code de confirmation a été envoyé au numéro de téléphone indiqué. "
+"Vérifiez votre boîte de réception pour récupérer le code et les instructions."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+"%1$s vient de marquer votre message de %2$s comme un de ses favoris.\n"
+"\n"
+"Dans le cas où vous l’auriez oublié, vous pouvez lire le texte de votre "
+"message ici :\n"
+"\n"
+"%3$s\n"
+"\n"
+"Vous pouvez consulter la liste des favoris de %1$s ici :\n"
+"\n"
+"%4$s\n"
+"\n"
+"Cordialement,\n"
+"%5$s\n"
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+msgid "No such user!"
+msgstr "Aucun utilisateur n'a été trouvé !"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Inscrivez votre compte Twitter pour transférer automatiquement vos statuts "
+"vers Twitter, "
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr ""
+"Impossible de récupérer l'information du compte de \"%s\" dans Twitter."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user's notices. If you didn't just ask to subscribe to someone's notices, "
+"click \"Reject\"."
+msgstr ""
+"Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous "
+"abonner aux statuts de cet utilisateur. Si vous n'avez pas demandé à vous "
+"abonner aux statuts de quelqu'un, cliquez \"Annuler\"."
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Rechercher des personnes ou du texte"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Trop de statuts, trop vite ! Prenez une pause et publiez à nouveau dans "
+"quelques minutes."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Connexion à la messagerie instantanée, SMS ou Twitter"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Clin d'Å“il"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+"Abonnements : %1$s\n"
+"Abonnés : %2$s\n"
+"Messages : %3$s"
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr "Erreur de la base de données"
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "Vous devez ouvrir une session pour utiliser l'application Facebook %s"
+
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr "Atom"
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr "Ce fichier est trop lourd. La taille maximale est %d."
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+"Bonjour %s.\n"
+"\n"
+"Quelqu’un vient d’utiliser cette adresse électronique sur %s.\n"
+"\n"
+"S’il s’agit bien de vous, et que vous souhaitez confirmer cette adresse, "
+"utilisez le lien qui suit :\n"
+"\n"
+"%s\n"
+"\n"
+"Dans le cas contraire, il vous suffit d’ignorer ce message.\n"
+"\n"
+"Merci de votre attention,\n"
+"%s\n"
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s suit maintenant vos statuts dans %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Cordialement,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+msgid "Search site"
+msgstr "Rechercher sur le site"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr "Plus..."
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "Pièce jointe non trouvée."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Liste des utilisateurs inscrits à ce groupe."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Liste des utilisateurs inscrits à ce groupe."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Profil de l'utilisateur"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s et ses amis - page %d"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Liste des utilisateurs inscrits à ce groupe."
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Le déblocage de l'utilisateur a échoué."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Code de confirmation"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "Ne pas supprimer cet avis"
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Marquage invalide : \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Pseudo déjà utilisé. Essayez-en un autre."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Impossible de créer le favori."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nouveau statut"
+
+#: actions/file.php:38
+msgid "No notice"
+msgstr "Aucun avis"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr "Aucune pièce jointe"
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+msgid "Not a valid invitation code."
+msgstr "Code d'invitation invalide."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "Aucun groupe n'a été spécifié."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Cet utilisateur vous a bloqué."
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "L'utilisateur n'est pas membre du groupe."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr "Bloquer cet utilisateur du groupe"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "Vous devez ouvrir une session pour modifier un groupe."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Groupes"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Impossible de mettre à jour l'utilisateur."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "L'enregistrement de votre configuration Twitter a échoué !"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Préférences de synchronisation enregistrées."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr "Faire de cet utilisateur un administrateur du groupe"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Administrer"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "Aucun résultat."
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Cet utilisateur vous a bloqué."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+msgid "Message sent"
+msgstr "Message envoyé"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+msgid "Couldn't save file."
+msgstr "Impossible d'enregistrer le fichier."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) vous permet de vous connecter à différents sites "
+"avec le même compte utilisateur. Gérez vos OpenID associés à partir d'ici."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Paramètres du profil"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"%%site.name%% est un service de [micro-blogging](http://fr.wikipedia.org/"
+"wiki/Microblog) "
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Si vous avez oublié ou perdu votre mot de passe, vous pouvez en recevoir un "
+"nouveau à l'adresse courriel indiquée dans votre compte. "
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr ""
+"Vous avez été identifié(e) avec succès. Veuillez entrer votre nouveau mot de "
+"passe ci-dessous."
+
+#: actions/recoverpassword.php:188
+msgid "Password recover"
+msgstr "Récupération de mot de passe"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Erreur dans le code de confirmation."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "S'abonner à cet utilisateur"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Statuts favoris de %s - page %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Fil des statuts du groupe %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Fil des statuts du groupe %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Fil des statuts du groupe %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"**%s** est un groupe d'utilisateurs du service de [micro-blogging](http://fr."
+"wikipedia.org/wiki/Microblog)  %%%%site.name%%%%"
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr "Administrateurs"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Ceci n'est pas un utilisateur local."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Statuts marqués avec %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Fil des statuts du groupe %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"**%s** est inscrit au service de [micro-blogging](http://fr.wikipedia.org/"
+"wiki/Microblog)  %%%%site.name%%%%"
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr "%s ne suit actuellement personne."
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Flux des statuts de %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Flux des statuts de %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr "Ce statut a déjà été ajouté à vos favoris !"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "Ce statut n'est pas un favori !"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Impossible de récupérer le flux public."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "Aucun destinataire n'a été spécifié."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+msgid "Could not find target user."
+msgstr "Impossible de trouver l'utilisateur cible."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Réponses à %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Statuts de %1$s dans %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr "Licence"
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+msgid "Reject this subscription"
+msgstr "Rejeter cet souscription"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr "Conception de profile"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr "%s n'est pas membre d'aucun groupe."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problème lors de l'enregistrement du statut."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Message adressé à %1$s le %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr "Conception"
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+msgid "Design your profile"
+msgstr "Concevez votre profile"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr "Pièces jointes"
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr "Auteur"
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr "Fournisseur"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Transfert"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Modifier les couleurs"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr "Contenu"
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Barre latérale"
+
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr "Liens"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Blocked"
+msgstr "Bloqué"
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "%s blocked users"
+msgstr "%s utilisateurs bloqués"
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr "Ajouter ou modifier la conception de %s"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+msgid "in context"
+msgstr "dans le contexte"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr "ID de l'utilisateur"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+msgid "Search help"
+msgstr "Aide sur la recherche"
+
+#: 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/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "&s n'est pas une couleur valide !"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Aucun marquage trouvé."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Messages envoyés à %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Impossible de suivre l'utilisateur : Utilisateur non trouvé."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "la description est trop longue (140 caractères maximum)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Vous êtes déjà membre de ce groupe "
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Impossible d'inscrire l'utilisateur %s au groupe %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Vous n'êtes pas membre de ce groupe."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Impossible de retirer l'utilisateur %s du groupe %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Groupes de %s"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Groupes de %s"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Actions du groupe"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar supprimé."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Format de fichier d'image non supporté."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Photo"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "la description est trop longue (140 caractères maximum)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Statuts de %1$s dans %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "L'utilisateur suivi n'existe pas."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Non autorisé."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Impossible de convertir les jetons de requête en jetons d'accès"
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Version inconnue du protocole OMB"
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Statut non trouvé. "
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Fichier perdu."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Statuts de %1$s dans %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Cette page n'est pas disponible dans "
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Ouvrez une session avec votre identifiant et votre mot de passe, ou [créez "
+"un compte](%%action.register%%), ou utilisez un identifiant [OpenID](%%"
+"action.openidlogin%%)."
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Statuts de %1$s dans %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Statuts correspondant au(x) terme(s) \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Contenu"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Décrivez vos intérêts en 140 caractères"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Décrivez qui vous êtes et vos "
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "La bio est trop longue (140 caractères maximum)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "URL de profil invalide (aucun document YADIS)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Ce profil est local ! Ouvrez une session pour vous abonner."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Impossible d'obtenir le jeton de requête."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Flux des statuts de %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Flux des statuts de %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Flux des statuts de %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Message adressé à %1$s le %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Flux pour les amis de %s (RSS 1.0)"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Flux pour les amis de %s (RSS 2.0)"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Flux pour les amis de %s (Atom)"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Boîte d'envoi de %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Statut publié"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Cette page n'est pas disponible dans "
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Flux des statuts de %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous "
+"abonner aux statuts de cet utilisateur. Si vous n'avez pas demandé à vous "
+"abonner aux statuts de quelqu'un, cliquez \"Annuler\"."
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"L'abonnement a été autorisé, mais l'URL de rappel n'a pas été validé. "
+"Vérifiez les instructions du site pour savoir comment compléter "
+"l'autorisation de l'abonnement. Votre jeton d'abonnement est :"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"L'abonnement a été refusé, mais l'URL de rappel n'a pas été validé. Vérifiez "
+"les instructions du site pour savoir comment refuser pleinement "
+"l'abonnement. "
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Impossible de lire l'URL '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Format d'image invalide pour '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Impossible de rediriger vers le serveur : %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Licence du logiciel StatusNet"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr ""
+"Impossible de mettre l'utilisateur à jour avec l'adresse courriel confirmée."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Clin d'œil envoyé"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+"Message trop long ! La taille maximale est de 140 caractères ; vous en avez "
+"entré %d."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+"Message trop long ! La taille maximale est de 140 caractères ; vous en avez "
+"entré %d."
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Répondre à ce statut"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problème lors de l'enregistrement du statut."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Aucun code de confirmation."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Ouvrir une session"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Sélectionnez un fournisseur de téléphone mobile"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Description du groupe ou du sujet (140 caractères maximum)"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Description du groupe ou du sujet (140 caractères maximum)"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Nouveau statut"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s a ajouté un de vos messages à ses favoris"
+
+#: lib/mail.php:556
+#, fuzzy, 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 ""
+"%1$s vient de marquer votre message de %2$s comme un de ses favoris.\n"
+"\n"
+"Dans le cas où vous l’auriez oublié, vous pouvez lire le texte de votre "
+"message ici :\n"
+"\n"
+"%3$s\n"
+"\n"
+"Vous pouvez consulter la liste des favoris de %1$s ici :\n"
+"\n"
+"%4$s\n"
+"\n"
+"Cordialement,\n"
+"%5$s\n"
 
-#~ msgid "Unsupported type"
-#~ msgstr "Type non supporté"
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
 
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
 #, fuzzy
-#~ msgid "not a supported data format"
-#~ msgstr "pas un format de données supporté"
+msgid "from"
+msgstr "de"
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Impossible de récupérer le flux public."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Supprimer ce statut"
diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo
index c13acd1a8..479e91256 100644
--- a/locale/ga/LC_MESSAGES/statusnet.mo
+++ b/locale/ga/LC_MESSAGES/statusnet.mo
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 3815e4853..39404b3df 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -1,68 +1,64 @@
-# translation of statusnet.po to Galician
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Translation of StatusNet to Irish
 #
-# Francisco Diéguez <fran.dieguez@glug.es>, 2008.
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: laconica-new\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-17 20:08+0100\n"
-"PO-Revision-Date: 2008-12-17 20:10+0100\n"
-"Last-Translator: Martín Vázquez Cabanas <eu@martinvazquez.net>\n"
-"Language-Team: Galician <en@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:41+0000\n"
+"Language-Team: Irish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ga\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64
-#: actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:61
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Buscar \"%s\" na Liña de tempo"
 
-#: ../actions/finishopenidlogin.php:82
-#: ../actions/register.php:191
-#: actions/finishopenidlogin.php:88
-#: actions/register.php:205
-#: actions/register.php:232
-msgid " except this private data: password, email address, IM address, phone number."
-msgstr " agás esta informción privada: contrasinal, dirección de correo electrónico, dirección IM, número de teléfono."
-
-#: ../actions/showstream.php:400
-#: ../lib/stream.php:109
-#: actions/showstream.php:418
-#: lib/mailbox.php:164
-#: lib/stream.php:76
-#: lib/facebookaction.php:195
-#: lib/noticelist.php:160
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
+msgid ""
+" except this private data: password, email address, IM address, phone number."
+msgstr ""
+" agás esta informción privada: contrasinal, dirección de correo electrónico, "
+"dirección IM, número de teléfono."
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
 msgstr " dende "
 
-#: ../actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:341
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Chíos que respostan a %2$s"
 
-#: ../actions/invite.php:168
-#: actions/invite.php:176
+#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s invitoute a unirse a él en %2$s."
 
-#: ../actions/invite.php:170
-#: actions/invite.php:178
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, 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"
+"%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"
+"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"
@@ -72,19 +68,24 @@ msgid ""
 "\n"
 "%5$s\n"
 "\n"
-"If you'd like to try the service, click on the link below to accept the invitation.\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"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
 "%1$s invitoute a unirte a el en %2$s (%3$s).\n"
 "\n"
-"%2$s é un servizo de microbloguexo que che permite manterte actualizado coa xente que coñeces e xente na que tes interese.\n"
+"%2$s é un servizo de microbloguexo que che permite manterte actualizado coa "
+"xente que coñeces e xente na que tes interese.\n"
 "\n"
-"Tamén podes compartir novas contigo mesmo, ou pensamentos, ou vivir en liña con xente que te coñece. Tamén está moi ben para coñecer xente que comparte os mesmos intereses..\n"
+"Tamén podes compartir novas contigo mesmo, ou pensamentos, ou vivir en liña "
+"con xente que te coñece. Tamén está moi ben para coñecer xente que comparte "
+"os mesmos intereses..\n"
 "\n"
 "%1$s dixo:\n"
 "\n"
@@ -102,16 +103,13 @@ msgstr ""
 "\n"
 "Saudiños, %2$s\n"
 
-#: ../lib/mail.php:124
-#: lib/mail.php:124
-#: lib/mail.php:126
-#: lib/mail.php:115
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s está a escoitar os teus chíos %2$s."
 
 #: ../lib/mail.php:126
-#: lib/mail.php:117
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -128,2946 +126,2935 @@ msgstr ""
 "Atentamente todo seu,\n"
 "%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
-#: actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:344
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
 
-#: ../actions/shownotice.php:45
-#: actions/shownotice.php:45
-#: actions/shownotice.php:73
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Estado de %1$s en  %2$s"
 
-#: ../actions/invite.php:84
-#: ../actions/invite.php:92
-#: actions/invite.php:91
-#: actions/invite.php:99
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../actions/publicrss.php:62
-#: actions/publicrss.php:48
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Fio Público"
 
-#: ../actions/all.php:47
-#: ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238
-#: ../lib/stream.php:51
-#: actions/all.php:47
-#: actions/allrss.php:60
-#: actions/twitapistatuses.php:155
-#: lib/personal.php:51
-#: actions/twitapistatuses.php:123
+#: ../actions/all.php:47 ../actions/allrss.php:60
+#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
+#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
+#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
+#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
 
-#: ../actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:31
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Liña de tempo pública de %s"
 
-#: ../lib/mail.php:206
-#: lib/mail.php:212
-#: lib/mail.php:207
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "Estado de %s"
 
-#: ../actions/twitapistatuses.php:338
-#: actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:195
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Liña de tempo de %s"
 
-#: ../actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:34
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s chíos de calquera!"
 
-#: ../actions/register.php:213
-#: actions/register.php:254
-msgid "(You should receive a message by email momentarily, with instructions on how to confirm your email address.)"
-msgstr "(Deberías recibir unha mensaxe no teu email nun intre, coas instrucións de como confirmar a túa dirección de correo.)"
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Deberías recibir unha mensaxe no teu email nun intre, coas instrucións de "
+"como confirmar a túa dirección de correo.)"
 
-#: ../lib/util.php:257
-#: lib/util.php:273
-#: lib/util.php:290
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
-msgid "**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). "
-msgstr "**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259
-#: lib/util.php:275
-#: lib/util.php:292
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** é un servizo de microbloguexo."
 
-#: ../lib/util.php:274
-#: lib/util.php:290
-#: lib/util.php:307
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Os contribuíntes deben atribuiselles polo nome completo ou apodo."
 
-#: ../actions/finishopenidlogin.php:73
-#: ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79
-#: actions/profilesettings.php:76
-#: actions/profilesettings.php:78
+#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación"
+msgstr ""
+"De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación"
 
-#: ../actions/register.php:152
-#: actions/register.php:166
-#: actions/register.php:193
+#: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "De 1 a 64 letras minúsculas ou números, nin espazos nin signos de puntuación. Requerido."
+msgstr ""
+"De 1 a 64 letras minúsculas ou números, nin espazos nin signos de "
+"puntuación. Requerido."
 
-#: ../actions/password.php:42
-#: actions/profilesettings.php:181
-#: actions/profilesettings.php:198
+#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 ou máis caracteres"
 
-#: ../actions/recoverpassword.php:180
-#: actions/recoverpassword.php:186
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 ou máis caracteres, non o esquenzas!"
 
-#: ../actions/register.php:154
-#: actions/register.php:168
-#: actions/register.php:195
+#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 ou máis caracteres. Requerido."
 
-#: ../actions/imsettings.php:197
-#: actions/imsettings.php:205
-#: actions/imsettings.php:210
-#, php-format
-msgid "A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you."
-msgstr "O código de confirmación foi embiado á dirección IM que engadiches. Deberías engadir a %s como contacto para que che poida enviar mensaxes."
-
-#: ../actions/emailsettings.php:213
-#: actions/emailsettings.php:231
-#: actions/emailsettings.php:235
-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 "Enviouseche un código de confirmación á dirección de correo que engadiches. Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que debes seguir."
-
-#: ../actions/smssettings.php:216
-#: actions/smssettings.php:224
-#: actions/smssettings.php:226
-msgid "A confirmation code was sent to the phone number you added. Check your inbox (and spam box!) for the code and instructions on how to use it."
-msgstr "Enviouseche o código de confirmación ó número de teléfono que engadiches. Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que debes seguir."
-
-#: ../actions/twitapiaccount.php:49
-#: ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88
-#: ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370
-#: ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-#: actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104
-#: actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120
-#: actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46
-#: actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176
-#: actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298
-#: actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463
-#: actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
-#: actions/twitapiaccount.php:35
-#: actions/twitapidirect_messages.php:107
-#: actions/twitapifavorites.php:83
-#: actions/twitapifavorites.php:99
-#: actions/twitapifriendships.php:117
-#: actions/twitapihelp.php:42
-#: actions/twitapistatuses.php:77
-#: actions/twitapistatuses.php:144
-#: actions/twitapistatuses.php:224
-#: actions/twitapistatuses.php:234
-#: actions/twitapistatuses.php:386
-#: actions/twitapistatuses.php:395
-#: actions/twitapistatuses.php:421
-#: actions/twitapiusers.php:30
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"O código de confirmación foi embiado á dirección IM que engadiches. Deberías "
+"engadir a %s como contacto para que che poida enviar mensaxes."
+
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"Enviouseche un código de confirmación á dirección de correo que engadiches. "
+"Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que "
+"debes seguir."
+
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"Enviouseche o código de confirmación ó número de teléfono que engadiches. "
+"Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que "
+"debes seguir."
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55 actions/twitapiaccount.php:37
+#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
+#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
+#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
+#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
+#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
+#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
+#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Método da API non atopado"
 
-#: ../actions/twitapiaccount.php:57
-#: ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119
-#: ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34
-#: ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
 #: ../actions/twitapidirect_messages.php:49
 #: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62
-#: ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47
-#: ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52
-#: ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35
-#: ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56
-#: actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114
-#: actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33
-#: actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168
-#: actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29
-#: actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
-#: actions/twitapiaccount.php:42
-#: actions/twitapiaccount.php:92
-#: actions/twitapiaccount.php:97
-#: actions/twitapidirect_messages.php:178
-#: actions/twitapifavorites.php:139
-#: actions/twitapihelp.php:49
-#: actions/twitapistatuses.php:549
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45
+#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
+#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
+#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
+#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "Método da API en contrución."
 
-#: ../lib/util.php:324
-#: lib/util.php:340
-#: lib/util.php:369
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Sobre"
 
-#: ../actions/userauthorization.php:119
-#: actions/userauthorization.php:126
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../actions/emailsettings.php:62
-#: ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57
-#: ../actions/smssettings.php:71
-#: actions/emailsettings.php:63
-#: actions/imsettings.php:64
-#: actions/openidsettings.php:58
-#: actions/smssettings.php:71
-#: actions/twittersettings.php:85
-#: actions/smspostsettings.php:50
-#: actions/twittersettings.php:84
-#: actions/smspostsettings.php:51
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/emailsettings.php:63 actions/imsettings.php:64
+#: actions/openidsettings.php:58 actions/smssettings.php:71
+#: actions/twittersettings.php:85 actions/emailsettings.php:120
+#: actions/imsettings.php:127 actions/openidsettings.php:111
+#: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Engadir"
 
-#: ../actions/openidsettings.php:43
-#: actions/openidsettings.php:44
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
 msgid "Add OpenID"
 msgstr "Engadir dirección OpenID"
 
-#: ../lib/settingsaction.php:97
-#: lib/settingsaction.php:91
-#: actions/deleteprofile.php:248
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
 msgstr "Engadir ou eliminar OpenID"
 
-#: ../actions/emailsettings.php:38
-#: ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
-#: actions/emailsettings.php:39
-#: actions/imsettings.php:40
-#: actions/smssettings.php:39
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../actions/invite.php:131
-#: actions/invite.php:139
+#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Direccións dos amigos que queres invitar (unha por liña)"
 
-#: ../actions/showstream.php:273
-#: actions/showstream.php:288
-#: actions/showstream.php:336
+#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Tódalas subscricións"
 
-#: ../actions/publicrss.php:64
-#: actions/publicrss.php:50
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Tódalas actualizacións de %s"
 
-#: ../actions/noticesearchrss.php:66
-#: actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:63
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Tódalas actualizacións que coinciden co termo de procura \"%s\""
 
-#: ../actions/finishopenidlogin.php:29
-#: ../actions/login.php:31
-#: ../actions/openidlogin.php:29
-#: ../actions/register.php:30
-#: actions/finishopenidlogin.php:29
-#: actions/login.php:31
-#: actions/openidlogin.php:29
-#: actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
+#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: actions/finishopenidlogin.php:29 actions/login.php:31
+#: actions/openidlogin.php:29 actions/register.php:30
+#: actions/finishopenidlogin.php:34 actions/login.php:77
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Sesión xa iniciada"
 
-#: ../lib/subs.php:42
-#: lib/subs.php:42
-#: lib/subs.php:47
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "¡Xa está subscrito!."
 
-#: ../actions/deletenotice.php:54
-#: actions/deletenotice.php:55
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Estas seguro que queres eliminar este chío?"
 
-#: ../actions/userauthorization.php:77
-#: actions/userauthorization.php:83
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Subscrición de autorización."
 
-#: ../actions/login.php:104
-#: ../actions/register.php:178
-#: actions/register.php:192
-#: actions/login.php:111
-#: actions/openidlogin.php:86
-#: actions/register.php:219
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
 
-#: ../actions/profilesettings.php:65
-#: actions/profilesettings.php:98
-#: actions/profilesettings.php:112
-msgid "Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "Suscribirse automáticamente a calquera que se suscriba a min (o mellor para non humáns)"
-
-#: ../actions/avatar.php:32
-#: ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
+"non humáns)"
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34 actions/avatarsettings.php:65
+#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../actions/avatar.php:113
-#: actions/profilesettings.php:350
-#: actions/profilesettings.php:396
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 
-#: ../actions/imsettings.php:55
-#: actions/imsettings.php:56
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, 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 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)"
+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 ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
 
-#: ../actions/emailsettings.php:54
-#: actions/emailsettings.php:55
-msgid "Awaiting confirmation on this address. Check your inbox (and spam box!) for a message with further instructions."
-msgstr "Agardando confirmación para esta dirección. Comproba a túa conta de Jabber/GTalk que ten que haber unha mensaxe coas seguintes instrucións. (Engadiches a %s á túa lista de contactos?)"
+#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Agardando confirmación para esta dirección. Comproba a túa conta de Jabber/"
+"GTalk que ten que haber unha mensaxe coas seguintes instrucións. (Engadiches "
+"a %s á túa lista de contactos?)"
 
-#: ../actions/smssettings.php:58
-#: actions/smssettings.php:58
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Agardando a confirmación neste número de teléfono."
 
-#: ../lib/util.php:1318
-#: lib/util.php:1452
-#: lib/facebookaction.php:259
-#: lib/util.php:1851
+#: ../lib/util.php:1318 lib/util.php:1452
 msgid "Before »"
 msgstr "Antes »"
 
-#: ../actions/profilesettings.php:49
-#: ../actions/register.php:170
-#: actions/profilesettings.php:82
-#: actions/register.php:184
-#: actions/profilesettings.php:84
-#: actions/register.php:211
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Bio"
 
-#: ../actions/profilesettings.php:101
-#: ../actions/register.php:82
-#: ../actions/updateprofile.php:103
-#: actions/profilesettings.php:216
-#: actions/register.php:89
-#: actions/updateprofile.php:104
-#: actions/profilesettings.php:235
-#: actions/register.php:98
+#: ../actions/profilesettings.php:101 ../actions/register.php:82
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
+#: actions/profilesettings.php:205 actions/register.php:174
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "O teu Bio é demasiado longo (max 140 car.)."
 
-#: ../lib/deleteaction.php:41
-#: lib/deleteaction.php:41
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Non se pode eliminar este chíos."
 
-#: ../actions/updateprofile.php:119
-#: actions/updateprofile.php:120
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Non se pode ler a URL do avatar de '%s'"
 
-#: ../actions/password.php:85
-#: ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404
-#: actions/recoverpassword.php:313
-#: actions/profilesettings.php:450
+#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Non se pode gardar a contrasinal."
 
-#: ../actions/emailsettings.php:57
-#: ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
-#: actions/emailsettings.php:58
-#: actions/imsettings.php:59
-#: actions/smssettings.php:62
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/openid.php:121
-#: lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Non se pode instanciar o obxecto consumidor de OpenID."
 
-#: ../actions/imsettings.php:163
-#: actions/imsettings.php:171
-#: actions/imsettings.php:176
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Non se pode normalizar ese identificador de Jabber"
 
-#: ../actions/emailsettings.php:181
-#: actions/emailsettings.php:199
-#: actions/emailsettings.php:205
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Esa dirección de correo non se pode normalizar "
 
-#: ../actions/password.php:45
-#: actions/profilesettings.php:184
-#: actions/profilesettings.php:201
+#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Modificado"
 
-#: ../lib/settingsaction.php:88
-#: lib/settingsaction.php:88
-#: actions/deleteprofile.php:245
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Cambiar a xestión de email"
 
-#: ../actions/password.php:32
-#: actions/profilesettings.php:36
+#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Cambiar contrasinal"
 
-#: ../lib/settingsaction.php:94
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Cambiar contrasinal"
 
-#: ../lib/settingsaction.php:85
-#: lib/settingsaction.php:85
-#: actions/deleteprofile.php:242
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Configuración de perfil"
 
-#: ../actions/password.php:43
-#: ../actions/recoverpassword.php:181
-#: ../actions/register.php:155
-#: ../actions/smssettings.php:65
-#: actions/profilesettings.php:182
-#: actions/recoverpassword.php:187
-#: actions/register.php:169
-#: actions/smssettings.php:65
-#: actions/profilesettings.php:199
-#: actions/register.php:196
+#: ../actions/password.php:43 ../actions/recoverpassword.php:181
+#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: actions/profilesettings.php:182 actions/recoverpassword.php:187
+#: actions/register.php:169 actions/smssettings.php:65
+#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
+#: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: ../actions/confirmaddress.php:90
-#: actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Confirmar enderezo"
 
-#: ../actions/emailsettings.php:238
-#: ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
-#: actions/emailsettings.php:256
-#: actions/imsettings.php:230
-#: actions/smssettings.php:253
-#: actions/emailsettings.php:260
-#: actions/imsettings.php:235
-#: actions/smssettings.php:255
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Confirmación cancealada."
 
-#: ../actions/smssettings.php:63
-#: actions/smssettings.php:63
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Código de confirmación."
 
-#: ../actions/confirmaddress.php:38
-#: actions/confirmaddress.php:38
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Confirmation code not found."
 
-#: ../actions/register.php:202
-#: actions/register.php:243
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to...\n"
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
 "\n"
 "* Go to [your profile](%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"
+"* 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 ""
 "Noraboa, %s! e benvido a %%%%site.name%%%%. Dende aquí, podes...\n"
 "\n"
 "* �r ó [teu perfil](%s) e enviar o teu primeiro chío.\n"
-"* Engadir unha [conta de Jabber/Gtalk](%%%%action.imsettings%%%%) para enviar os teus chíos a través de mensaxería instantánea.\n"
-"* [Buscar xente ](%%%%action.peoplesearch%%%%) que poidas coñecer ou que comparta os teus intereses. \n"
-"* Actualizar as túas [preferencias no perfil](%%%%action.profilesettings%%%%) para decirlle a outros máis sobre ti. \n"
-"* Ler os [manuais en liña](%%%%doc.help%%%%) para ollar máis cousas que podes facer aquí. \n"
+"* Engadir unha [conta de Jabber/Gtalk](%%%%action.imsettings%%%%) para "
+"enviar os teus chíos a través de mensaxería instantánea.\n"
+"* [Buscar xente ](%%%%action.peoplesearch%%%%) que poidas coñecer ou que "
+"comparta os teus intereses. \n"
+"* Actualizar as túas [preferencias no perfil](%%%%action.profilesettings%%%"
+"%) para decirlle a outros máis sobre ti. \n"
+"* Ler os [manuais en liña](%%%%doc.help%%%%) para ollar máis cousas que "
+"podes facer aquí. \n"
 "\n"
 "Grazas por rexistrarte e esperamos que laretexes moito."
 
-#: ../actions/finishopenidlogin.php:91
-#: actions/finishopenidlogin.php:97
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../actions/finishopenidlogin.php:86
-#: actions/finishopenidlogin.php:92
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Conectar con unha conta existente"
 
-#: ../lib/util.php:332
-#: lib/util.php:348
-#: lib/util.php:377
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../lib/openid.php:178
-#: lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Non se pode crear o formulario OpenID: %s"
 
-#: ../actions/twitapifriendships.php:60
-#: ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60
-#: actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:46
-#: actions/twitapifriendships.php:62
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Non podes seguir a este usuario: %s xa está na túa lista."
 
-#: ../actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:39
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
 
-#: ../lib/openid.php:160
-#: lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Non se pode redireccionar ao servidor: %s"
 
-#: ../actions/updateprofile.php:162
-#: actions/updateprofile.php:163
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Non se pode gardar a información do avatar"
 
-#: ../actions/updateprofile.php:155
-#: actions/updateprofile.php:156
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Non se pode gardar a nova información do perfil"
 
-#: ../lib/subs.php:54
-#: lib/subs.php:61
-#: lib/subs.php:70
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Outro usuario non se puido suscribir a ti."
 
-#: ../lib/subs.php:46
-#: lib/subs.php:46
-#: lib/subs.php:55
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "No se pode suscribir."
 
-#: ../actions/recoverpassword.php:102
-#: actions/recoverpassword.php:105
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+#: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
 msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
 
 #: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
-#: actions/finishremotesubscribe.php:112
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Non se pode convertir o token da petición a tokens de acceso."
 
-#: ../actions/confirmaddress.php:84
-#: ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218
-#: ../actions/smssettings.php:241
-#: actions/confirmaddress.php:84
-#: actions/emailsettings.php:252
-#: actions/imsettings.php:226
-#: actions/smssettings.php:249
-#: actions/emailsettings.php:256
-#: actions/imsettings.php:231
-#: actions/smssettings.php:251
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/confirmaddress.php:126 actions/emailsettings.php:375
+#: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Non se pode eliminar a confirmación de email."
 
-#: ../lib/subs.php:103
-#: lib/subs.php:116
-#: lib/subs.php:129
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Non se pode eliminar a subscrición."
 
-#: ../actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:82
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Non se puido atopar ningún estado"
 
-#: ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:148
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:178
 msgid "Couldn't get a request token."
 msgstr "Non se puido recoller o token de petición."
 
-#: ../actions/emailsettings.php:205
-#: ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
-#: actions/emailsettings.php:223
-#: actions/imsettings.php:195
-#: actions/smssettings.php:214
-#: actions/emailsettings.php:229
-#: actions/imsettings.php:200
-#: actions/smssettings.php:216
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+#: actions/emailsettings.php:337 actions/imsettings.php:311
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Non se puido inserir o código de confirmación."
 
 #: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
-#: actions/finishremotesubscribe.php:198
-#: actions/finishremotesubscribe.php:216
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir a nova subscrición."
 
-#: ../actions/profilesettings.php:184
-#: ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299
-#: actions/twitapiaccount.php:94
-#: actions/profilesettings.php:336
-#: actions/twitapiaccount.php:77
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Non se puido gardar o perfil."
 
-#: ../actions/profilesettings.php:161
-#: actions/profilesettings.php:276
-#: actions/profilesettings.php:313
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Non se puido actualizar o usuario para autosuscrición."
 
-#: ../actions/emailsettings.php:280
-#: ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298
-#: actions/emailsettings.php:312
-#: actions/emailsettings.php:302
-#: actions/emailsettings.php:316
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Non se puido actualizar o rexistro de usuario."
 
-#: ../actions/confirmaddress.php:72
-#: ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259
-#: ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243
-#: ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157
-#: ../actions/smssettings.php:269
-#: actions/confirmaddress.php:72
-#: actions/emailsettings.php:174
-#: actions/emailsettings.php:277
-#: actions/imsettings.php:146
-#: actions/imsettings.php:251
-#: actions/profilesettings.php:256
-#: actions/smssettings.php:165
-#: actions/smssettings.php:277
-#: actions/emailsettings.php:180
-#: actions/emailsettings.php:281
-#: actions/imsettings.php:151
-#: actions/imsettings.php:256
-#: actions/othersettings.php:173
-#: actions/profilesettings.php:293
-#: actions/smspostsettings.php:96
-#: actions/smspostsettings.php:123
-#: actions/smssettings.php:167
-#: actions/smssettings.php:279
-#: actions/smspostsettings.php:101
-#: actions/smspostsettings.php:128
+#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
+#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
+#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
+#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: actions/confirmaddress.php:72 actions/emailsettings.php:174
+#: actions/emailsettings.php:277 actions/imsettings.php:146
+#: actions/imsettings.php:251 actions/profilesettings.php:256
+#: actions/smssettings.php:165 actions/smssettings.php:277
+#: actions/confirmaddress.php:114 actions/emailsettings.php:280
+#: actions/emailsettings.php:411 actions/imsettings.php:252
+#: actions/imsettings.php:395 actions/othersettings.php:162
+#: actions/profilesettings.php:259 actions/smssettings.php:266
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Non se puido actualizar o usuario."
 
-#: ../actions/finishopenidlogin.php:84
-#: actions/finishopenidlogin.php:90
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Crear"
 
-#: ../actions/finishopenidlogin.php:70
-#: actions/finishopenidlogin.php:76
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Crear un novo usuario con este alcume."
 
-#: ../actions/finishopenidlogin.php:68
-#: actions/finishopenidlogin.php:74
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Crear nova conta"
 
-#: ../actions/finishopenidlogin.php:191
-#: actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:208
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Creando nova conta para OpenID que xa ten un usuario."
 
-#: ../actions/imsettings.php:45
-#: actions/imsettings.php:46
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Direccións Jabber/GTalk confirmadas."
 
-#: ../actions/smssettings.php:46
-#: actions/smssettings.php:46
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de teléfono actual confirmado mediante SMS."
 
-#: ../actions/emailsettings.php:44
-#: actions/emailsettings.php:45
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Direccións de correo confirmadas actualmente."
 
-#: ../actions/showstream.php:356
-#: actions/showstream.php:367
-#: actions/showstream.php:418
+#: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "Actual"
 
-#: ../classes/Notice.php:72
-#: classes/Notice.php:86
-#: classes/Notice.php:87
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Erro ó inserir o hashtag na BD: %s"
 
-#: ../lib/util.php:1061
-#: lib/util.php:1110
-#: lib/util.php:1479
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Erro ó inserir a contestación na BD: %s"
 
-#: ../actions/deletenotice.php:41
-#: actions/deletenotice.php:41
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Eliminar chío"
 
-#: ../actions/profilesettings.php:51
-#: ../actions/register.php:172
-#: actions/profilesettings.php:84
-#: actions/register.php:186
-#: actions/profilesettings.php:86
-#: actions/register.php:213
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 
-#: ../actions/register.php:158
-#: ../actions/register.php:161
-#: ../lib/settingsaction.php:87
-#: actions/register.php:172
-#: actions/register.php:175
-#: lib/settingsaction.php:87
-#: actions/deleteprofile.php:244
-#: actions/register.php:199
-#: actions/register.php:202
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: ../actions/emailsettings.php:59
-#: actions/emailsettings.php:60
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Enderezo de correo"
 
-#: ../actions/emailsettings.php:32
-#: actions/emailsettings.php:32
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
 msgid "Email Settings"
 msgstr "Configuración de Correo"
 
-#: ../actions/register.php:73
-#: actions/register.php:80
-#: actions/register.php:89
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "O enderezo de correo xa existe."
 
-#: ../lib/mail.php:90
-#: lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmar correo electrónico"
 
-#: ../actions/emailsettings.php:61
-#: actions/emailsettings.php:62
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Dirección de correo, coma \"Nomede Usuario@exemplo.org\""
 
-#: ../actions/invite.php:129
-#: actions/invite.php:137
+#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Enderezos de correo"
 
-#: ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Insire o teu alcume ou enderezo de correo."
 
-#: ../actions/smssettings.php:64
-#: actions/smssettings.php:64
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Insire o código que recibiches no teu teléfono."
 
-#: ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Erro no token de autorización."
 
-#: ../actions/finishopenidlogin.php:253
-#: actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:274
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Acounteceu un erro conectando o usuario ó OpenID."
 
-#: ../actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126
 msgid "Error connecting user."
 msgstr "Acounteceu un erro ó conectar co usuario"
 
 #: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
-#: actions/finishremotesubscribe.php:164
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Acounteceu un erro ó inserir o avatar"
 
 #: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
-#: actions/finishremotesubscribe.php:156
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Acounteceu un erro ó inserir o novo perfil"
 
 #: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
-#: actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Aconteceu un erro ó inserir o perfil remoto"
 
-#: ../actions/recoverpassword.php:240
-#: actions/recoverpassword.php:246
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Acounteceu un erro gardando a confirmación de enderezo."
 
-#: ../actions/userauthorization.php:140
-#: actions/userauthorization.php:147
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Acounteceu un erro gardando o perfil remoto."
 
-#: ../lib/openid.php:226
-#: lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Acounteceu un erro ó gardar o perfil."
 
-#: ../lib/openid.php:237
-#: lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Acounteceu un erro gardando o usuario."
 
-#: ../actions/password.php:80
-#: actions/profilesettings.php:399
-#: actions/profilesettings.php:445
+#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Acounteceu un erro gardando o usuario: é inválido."
 
-#: ../actions/login.php:47
-#: ../actions/login.php:73
-#: ../actions/recoverpassword.php:307
-#: ../actions/register.php:98
-#: actions/login.php:47
-#: actions/login.php:73
-#: actions/recoverpassword.php:320
-#: actions/register.php:108
-#: actions/login.php:54
-#: actions/login.php:80
-#: actions/register.php:117
+#: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108 actions/login.php:112 actions/login.php:138
+#: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Acounteceu un erro configurando o usuario."
 
-#: ../actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
 msgid "Error updating profile"
 msgstr "Acounteceu un erro actualizando o usuario"
 
 #: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
-#: actions/finishremotesubscribe.php:174
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Acounteceu un erro actualizando o perfil remoto"
 
-#: ../actions/recoverpassword.php:80
-#: actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
 msgstr "Acounteceu un erro co código de confirmación."
 
-#: ../actions/finishopenidlogin.php:89
-#: actions/finishopenidlogin.php:95
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Alcume existente"
 
-#: ../lib/util.php:326
-#: lib/util.php:342
-#: lib/util.php:371
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "Preguntas frecuentes"
 
-#: ../actions/avatar.php:115
-#: actions/profilesettings.php:352
-#: actions/profilesettings.php:398
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Acounteceu un fallo ó actualizar o avatar."
 
-#: ../actions/all.php:61
-#: ../actions/allrss.php:64
-#: actions/all.php:61
-#: actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Fonte para os amigos de %s"
 
-#: ../actions/replies.php:65
-#: ../actions/repliesrss.php:80
-#: actions/replies.php:65
-#: actions/repliesrss.php:66
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Fonte para as contestacións de %s"
 
-#: ../actions/tag.php:55
-#: actions/tag.php:55
-#: actions/tag.php:61
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Fonte para a etiqueta %s"
 
-#: ../lib/searchaction.php:105
-#: lib/searchaction.php:105
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Atopar no contido dos chíos"
 
-#: ../lib/searchaction.php:101
-#: lib/searchaction.php:101
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Atopar xente neste sitio"
 
-#: ../actions/login.php:122
-#: actions/login.php:142
-msgid "For security reasons, please re-enter your user name and password before changing your settings."
-msgstr "Por razóns de seguranza, por favor re-insire o teu nome de usuario e contrasinal antes de cambiar as túas preferenzas."
-
-#: ../actions/profilesettings.php:44
-#: ../actions/register.php:164
-#: actions/profilesettings.php:77
-#: actions/register.php:178
-#: actions/profilesettings.php:79
-#: actions/register.php:205
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Por razóns de seguranza, por favor re-insire o teu nome de usuario e "
+"contrasinal antes de cambiar as túas preferenzas."
+
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:103 actions/register.php:391
+#: actions/showgroup.php:235 actions/showstream.php:262
+#: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../actions/profilesettings.php:98
-#: ../actions/register.php:79
-#: ../actions/updateprofile.php:93
-#: actions/profilesettings.php:213
-#: actions/register.php:86
-#: actions/updateprofile.php:94
-#: actions/profilesettings.php:232
-#: actions/register.php:95
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+#: actions/editgroup.php:195 actions/newgroup.php:146
+#: actions/profilesettings.php:202 actions/register.php:171
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "O nome completo é demasiado longo (max 255 car)."
 
-#: ../lib/util.php:322
-#: lib/util.php:338
-#: lib/util.php:359
-#: lib/util.php:367
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Axuda"
 
-#: ../lib/util.php:298
-#: lib/util.php:314
-#: lib/util.php:343
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Persoal"
 
-#: ../actions/profilesettings.php:46
-#: ../actions/register.php:167
-#: actions/profilesettings.php:79
-#: actions/register.php:181
-#: actions/profilesettings.php:81
-#: actions/register.php:208
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:107 actions/register.php:396
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Páxina persoal"
 
-#: ../actions/profilesettings.php:95
-#: ../actions/register.php:76
-#: actions/profilesettings.php:210
-#: actions/register.php:83
-#: actions/profilesettings.php:229
-#: actions/register.php:92
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/editgroup.php:192 actions/newgroup.php:143
+#: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "A páxina persoal semella que non é unha URL válida."
 
-#: ../actions/emailsettings.php:91
-#: actions/emailsettings.php:98
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Quero enviar chíos dende o mail."
 
-#: ../lib/settingsaction.php:102
-#: lib/settingsaction.php:96
-#: actions/deleteprofile.php:253
-#: lib/settingsaction.php:100
-#: lib/settingsaction.php:102
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
 
-#: ../actions/imsettings.php:60
-#: actions/imsettings.php:61
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Enderezo de IM"
 
-#: ../actions/imsettings.php:33
-#: actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
 msgid "IM Settings"
 msgstr "Configuracións de IM"
 
-#: ../actions/finishopenidlogin.php:88
-#: actions/finishopenidlogin.php:94
-msgid "If you already have an account, login with your username and password to connect it to your OpenID."
-msgstr "Se xa tes unha conta, accede co teu usuario e contrasinal para conectar co teu OpenID."
-
-#: ../actions/openidsettings.php:45
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"."
-msgstr "Se queres engadir un enderezo OpenID á tua conta, insirea na caixa de embaixo e fai clic en \"Engadir\"."
-
-#: ../actions/recoverpassword.php:137
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your password, you can get a new one sent to the email address you have stored  in your account."
-msgstr "Se esquenceches ou perdeches a túa contrasinal, podes obter unha nova no enderezo de correo que configuraches na túa conta."
-
-#: ../actions/emailsettings.php:67
-#: ../actions/smssettings.php:76
-#: actions/emailsettings.php:68
-#: actions/smssettings.php:76
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+"Se xa tes unha conta, accede co teu usuario e contrasinal para conectar co "
+"teu OpenID."
+
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Se queres engadir un enderezo OpenID á tua conta, insirea na caixa de "
+"embaixo e fai clic en \"Engadir\"."
+
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored  in your account."
+msgstr ""
+"Se esquenceches ou perdeches a túa contrasinal, podes obter unha nova no "
+"enderezo de correo que configuraches na túa conta."
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+#: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Correo Entrante"
 
-#: ../actions/emailsettings.php:283
-#: actions/emailsettings.php:301
-#: actions/emailsettings.php:305
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Dirección de correo entrante eliminada."
 
-#: ../actions/password.php:69
-#: actions/profilesettings.php:388
-#: actions/profilesettings.php:434
+#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Contrasinal actual incorrecta"
 
-#: ../actions/login.php:67
-#: actions/login.php:67
-#: actions/login.php:74
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Usuario ou contrasinal incorrectos."
 
-#: ../actions/recoverpassword.php:265
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password have been sent to the email address registered to your account."
-msgstr "As instruccións para recuperar a túa contrasinal foron enviadas ó enderezo de correo da túa conta."
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"As instruccións para recuperar a túa contrasinal foron enviadas ó enderezo "
+"de correo da túa conta."
 
-#: ../actions/updateprofile.php:114
-#: actions/updateprofile.php:115
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "URL do avatar '%s' inválido"
 
-#: ../actions/invite.php:55
-#: actions/invite.php:62
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Dirección de correo Inválida: %s"
 
-#: ../actions/updateprofile.php:98
-#: actions/updateprofile.php:99
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Páxina persoal '%s' inválida"
 
-#: ../actions/updateprofile.php:82
-#: actions/updateprofile.php:83
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "URL de licenza '%s' inválida"
 
-#: ../actions/postnotice.php:61
-#: actions/postnotice.php:62
-#: actions/postnotice.php:63
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Contido do chío inválido"
 
-#: ../actions/postnotice.php:67
-#: actions/postnotice.php:68
-#: actions/postnotice.php:69
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
 msgid "Invalid notice uri"
 msgstr "Enderezo de chío inválido"
 
-#: ../actions/postnotice.php:72
-#: actions/postnotice.php:73
-#: actions/postnotice.php:74
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
 msgid "Invalid notice url"
 msgstr "Enderezo de chío inválido"
 
-#: ../actions/updateprofile.php:87
-#: actions/updateprofile.php:88
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Enderezo de perfil inválido '%s'."
 
-#: ../actions/remotesubscribe.php:96
-#: actions/remotesubscribe.php:105
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "Enderezo de perfil inválido (formato incorrecto)"
 
 #: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
-#: actions/finishremotesubscribe.php:78
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
 msgstr "Enderezo de perfil inválido devolto polo servidor."
 
-#: ../actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Tamaño inválido."
 
-#: ../actions/finishopenidlogin.php:235
-#: ../actions/register.php:93
-#: ../actions/register.php:111
-#: actions/finishopenidlogin.php:241
-#: actions/register.php:103
-#: actions/register.php:121
-#: actions/finishopenidlogin.php:256
-#: actions/register.php:112
-#: actions/register.php:130
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Usuario ou contrasinal inválidos."
 
-#: ../actions/invite.php:79
-#: actions/invite.php:86
+#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Invitación(s) enviada(s)."
 
-#: ../actions/invite.php:97
-#: actions/invite.php:104
+#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Invitación(s) enviada(s) á seguinte xente:"
 
-#: ../lib/util.php:306
-#: lib/util.php:322
-#: lib/util.php:382
+#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../actions/invite.php:123
-#: actions/invite.php:130
+#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Invitar a novos usuarios"
 
-#: ../lib/util.php:261
-#: lib/util.php:277
-#: lib/util.php:294
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 "Correndo o software de microblogaxe [StatusNet](http://status.net/), versión %s, dispoñible baixo licenza [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+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 ""
+"Correndo o software de microblogaxe [StatusNet](http://status.net/), versión "
+"%s, dispoñible baixo licenza [GNU Affero General Public License](http://www."
+"fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
-#: actions/imsettings.php:181
-#: actions/imsettings.php:186
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "O identificador de Jabber xa pertence a outro usuario."
 
-#: ../actions/imsettings.php:62
-#: actions/imsettings.php:63
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, 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 "Enderezo Jabber ou GTalk, coma \"NomeUsuario@Exemplo.org\". Primeiro, asegurate de engadir %s á tua lista de contactos no teu cliente de IM ou no GTalk."
+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 ""
+"Enderezo Jabber ou GTalk, coma \"NomeUsuario@Exemplo.org\". Primeiro, "
+"asegurate de engadir %s á tua lista de contactos no teu cliente de IM ou no "
+"GTalk."
 
-#: ../actions/profilesettings.php:57
-#: actions/profilesettings.php:90
-#: actions/profilesettings.php:98
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Linguaxe"
 
-#: ../actions/profilesettings.php:113
-#: actions/profilesettings.php:228
-#: actions/profilesettings.php:247
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "A Linguaxe é demasiado longa (max 50 car.)."
 
-#: ../actions/profilesettings.php:52
-#: ../actions/register.php:173
-#: actions/profilesettings.php:85
-#: actions/register.php:187
-#: actions/profilesettings.php:87
-#: actions/register.php:214
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:117 actions/register.php:408
+#: actions/showgroup.php:244 actions/showstream.php:271
+#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Localización"
 
-#: ../actions/profilesettings.php:104
-#: ../actions/register.php:85
-#: ../actions/updateprofile.php:108
-#: actions/profilesettings.php:219
-#: actions/register.php:92
-#: actions/updateprofile.php:109
-#: actions/profilesettings.php:238
-#: actions/register.php:101
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+#: actions/editgroup.php:201 actions/newgroup.php:152
+#: actions/profilesettings.php:208 actions/register.php:177
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "A localización é demasiado longa (max 255 car.)."
 
-#: ../actions/login.php:97
-#: ../actions/login.php:106
-#: ../actions/openidlogin.php:68
-#: ../lib/util.php:310
-#: actions/login.php:97
-#: actions/login.php:106
-#: actions/openidlogin.php:77
-#: lib/util.php:326
-#: actions/login.php:104
-#: actions/login.php:113
-#: actions/login.php:129
-#: actions/openidlogin.php:88
-#: lib/util.php:352
+#: ../actions/login.php:97 ../actions/login.php:106
+#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
+#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
+#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
+#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
+#, php-format
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../actions/openidlogin.php:44
-#: actions/openidlogin.php:52
-#: actions/openidlogin.php:60
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Acceder con unha conta [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
-#: actions/login.php:146
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
-msgid "Login with your username and password. Don't have a username yet? [Register](%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%%). "
-msgstr "Accede co teu nome de usuario e contrasinal. ¿Non tes un todavía?? [Rexistra](%%action.register%%) unha nova conta, ou accede co teu enderezo [OpenID](%%action.openidlogin%%). "
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
+msgstr ""
+"Accede co teu nome de usuario e contrasinal. ¿Non tes un todavía?? [Rexistra]"
+"(%%action.register%%) unha nova conta, ou accede co teu enderezo [OpenID](%%"
+"action.openidlogin%%). "
 
-#: ../lib/util.php:308
-#: lib/util.php:324
-#: lib/util.php:350
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Sair"
 
-#: ../actions/register.php:166
-#: actions/register.php:180
-#: actions/register.php:207
+#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome máis longo, preferiblemente o teu nome \"real\""
 
-#: ../actions/login.php:110
-#: actions/login.php:110
-#: actions/login.php:118
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "¿Perdeches a contrasinal?"
 
-#: ../actions/emailsettings.php:80
-#: ../actions/smssettings.php:89
-#: actions/emailsettings.php:81
-#: actions/smssettings.php:89
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
+#: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Crear unha nova dirección de correo para enviar, elimina a antiga."
 
-#: ../actions/emailsettings.php:27
-#: actions/emailsettings.php:27
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Xestina como recibir correo dende %%site.name%%."
 
-#: ../actions/showstream.php:300
-#: actions/showstream.php:315
-#: actions/showstream.php:363
+#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Membro dende"
 
-#: ../actions/userrss.php:70
-#: actions/userrss.php:67
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblogue por %s"
 
-#: ../actions/smssettings.php:304
-#: actions/smssettings.php:314
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, 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 "Operadora móbil do teu teléfono. Se sabes se a operadora acepta SMS sobre email e non está listada aquí, envianos unha mensaxe para incluilo en %s."
-
-#: ../actions/finishopenidlogin.php:79
-#: ../actions/register.php:188
-#: actions/finishopenidlogin.php:85
-#: actions/register.php:202
-#: actions/register.php:229
+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 ""
+"Operadora móbil do teu teléfono. Se sabes se a operadora acepta SMS sobre "
+"email e non está listada aquí, envianos unha mensaxe para incluilo en %s."
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "O meu texto e arquivos están dispoñibles baixo licenza "
 
-#: ../actions/emailsettings.php:82
-#: ../actions/smssettings.php:91
-#: actions/emailsettings.php:83
-#: actions/smssettings.php:91
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+#: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Novo"
 
-#: ../lib/mail.php:144
-#: lib/mail.php:144
-#: lib/mail.php:138
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nova dirección de email para posterar en %s"
 
-#: ../actions/emailsettings.php:297
-#: actions/emailsettings.php:315
-#: actions/emailsettings.php:319
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "Engadida nova dirección de correo entrante."
 
-#: ../actions/finishopenidlogin.php:71
-#: actions/finishopenidlogin.php:77
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Novo alcume"
 
-#: ../actions/newnotice.php:87
-#: actions/newnotice.php:96
-#: actions/newnotice.php:141
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Novo chío"
 
-#: ../actions/password.php:41
-#: ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180
-#: actions/recoverpassword.php:185
-#: actions/profilesettings.php:197
+#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nova contrasinal"
 
-#: ../actions/recoverpassword.php:314
-#: actions/recoverpassword.php:327
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
 
-#: ../actions/login.php:101
-#: ../actions/profilesettings.php:41
-#: ../actions/register.php:151
-#: actions/login.php:101
-#: actions/profilesettings.php:74
-#: actions/register.php:165
-#: actions/login.php:108
-#: actions/profilesettings.php:76
-#: actions/register.php:192
+#: ../actions/login.php:101 ../actions/profilesettings.php:41
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+#: actions/login.php:228 actions/profilesettings.php:98
+#: actions/register.php:367 actions/showgroup.php:224
+#: actions/showstream.php:251 actions/tagother.php:95
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Alcume"
 
-#: ../actions/finishopenidlogin.php:175
-#: ../actions/profilesettings.php:110
-#: ../actions/register.php:69
-#: actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225
-#: actions/register.php:76
-#: actions/finishopenidlogin.php:192
-#: actions/profilesettings.php:244
-#: actions/register.php:85
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
+#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
+#: actions/newgroup.php:134 actions/profilesettings.php:214
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
 
-#: ../actions/finishopenidlogin.php:165
-#: ../actions/profilesettings.php:88
-#: ../actions/register.php:67
-#: ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171
-#: actions/profilesettings.php:203
-#: actions/register.php:74
-#: actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:182
-#: actions/profilesettings.php:222
-#: actions/register.php:83
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
+#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
+#: actions/register.php:74 actions/updateprofile.php:78
+#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos."
 
-#: ../actions/finishopenidlogin.php:170
-#: actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:187
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Alcume non permitido."
 
-#: ../actions/remotesubscribe.php:72
-#: actions/remotesubscribe.php:81
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Alcume de usuario que queres"
 
-#: ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Alcume ou email"
 
-#: ../actions/deletenotice.php:59
-#: actions/deletenotice.php:60
-#: actions/block.php:104
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "No"
 
-#: ../actions/imsettings.php:156
-#: actions/imsettings.php:164
-#: actions/imsettings.php:169
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Sen Identificador de Jabber."
 
-#: ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Sen petición de autorización!"
 
-#: ../actions/smssettings.php:181
-#: actions/smssettings.php:189
-#: actions/smssettings.php:191
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Non se seleccionou unha operadora."
 
-#: ../actions/smssettings.php:316
-#: actions/smssettings.php:324
-#: actions/smssettings.php:326
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Non se inseriu ningún código"
 
-#: ../actions/confirmaddress.php:33
-#: actions/confirmaddress.php:33
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+#: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Sen código de confirmación."
 
-#: ../actions/newnotice.php:44
-#: actions/newmessage.php:53
-#: actions/newnotice.php:44
-#: classes/Command.php:197
-#: actions/newmessage.php:52
-#: actions/newnotice.php:53
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
+#: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Sen contido!"
 
-#: ../actions/emailsettings.php:174
-#: actions/emailsettings.php:192
-#: actions/emailsettings.php:198
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Non se inseriu unha dirección de correo"
 
-#: ../actions/userbyid.php:32
-#: actions/userbyid.php:32
+#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
 msgstr "Sen id."
 
-#: ../actions/emailsettings.php:271
-#: actions/emailsettings.php:289
-#: actions/emailsettings.php:293
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "Non hai direccións de correo entrante"
 
 #: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
-#: actions/finishremotesubscribe.php:66
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
 msgid "No nickname provided by remote server."
 msgstr "O servidor remoto non proporcionou un alcume."
 
-#: ../actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Sen alcume."
 
-#: ../actions/emailsettings.php:222
-#: ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
-#: actions/emailsettings.php:240
-#: actions/imsettings.php:214
-#: actions/smssettings.php:237
-#: actions/emailsettings.php:244
-#: actions/imsettings.php:219
-#: actions/smssettings.php:239
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:363 actions/imsettings.php:345
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Non hai ningunha confirmación pendente para cancelar."
 
-#: ../actions/smssettings.php:176
-#: actions/smssettings.php:184
-#: actions/smspostsettings.php:76
-#: actions/smssettings.php:186
-#: actions/smspostsettings.php:81
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Non hai ningún número de teléfono."
 
 #: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
-#: actions/finishremotesubscribe.php:73
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
 msgid "No profile URL returned by server."
 msgstr "O servidor non voltou ningún enderezo de perfil."
 
-#: ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Non hai un enderezo de correo rexistrado para ese usuario."
 
-#: ../actions/userauthorization.php:49
-#: actions/userauthorization.php:55
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
 msgid "No request found!"
 msgstr "¡Non se atoparon peticións!"
 
-#: ../actions/noticesearch.php:64
-#: ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69
-#: actions/peoplesearch.php:69
-#: actions/noticesearch.php:68
-#: actions/peoplesearch.php:59
+#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/groupsearch.php:81 actions/noticesearch.php:104
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Non se atoparon resultados"
 
-#: ../actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "Sen tamaño."
 
-#: ../actions/twitapistatuses.php:595
-#: actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-#: actions/twitapifavorites.php:109
-#: actions/twitapistatuses.php:438
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Non se atopou un estado con ese ID."
 
-#: ../actions/twitapistatuses.php:555
-#: actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:411
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Non existe ningún estado con esa ID atopada."
 
-#: ../actions/openidsettings.php:135
-#: actions/openidsettings.php:144
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
 msgid "No such OpenID."
 msgstr "Ningún OpenID."
 
-#: ../actions/doc.php:29
-#: actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Ningún documento."
 
-#: ../actions/shownotice.php:32
-#: ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
-#: actions/shownotice.php:32
-#: actions/shownotice.php:83
-#: lib/deleteaction.php:30
-#: actions/shownotice.php:38
-#: actions/shownotice.php:114
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ningún chío."
 
-#: ../actions/recoverpassword.php:56
-#: actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+#: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "Ningún código de recuperación."
 
-#: ../actions/postnotice.php:56
-#: actions/postnotice.php:57
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
+#: actions/postnotice.php:60
 msgid "No such subscription"
 msgstr "Ningunha subscripción"
 
-#: ../actions/all.php:34
-#: ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43
-#: ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57
-#: ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110
-#: ../actions/userbyid.php:36
-#: ../actions/userrss.php:35
-#: ../actions/xrds.php:35
-#: ../lib/gallery.php:57
-#: ../lib/subs.php:33
-#: ../lib/subs.php:82
-#: actions/all.php:34
-#: actions/allrss.php:35
-#: actions/avatarbynickname.php:43
-#: actions/favoritesrss.php:35
-#: actions/foaf.php:40
-#: actions/ical.php:31
-#: actions/remotesubscribe.php:93
-#: actions/remotesubscribe.php:100
-#: actions/replies.php:57
-#: actions/repliesrss.php:35
-#: actions/showfavorites.php:34
-#: actions/showstream.php:110
-#: actions/userbyid.php:36
-#: actions/userrss.php:35
-#: actions/xrds.php:35
-#: classes/Command.php:120
-#: classes/Command.php:162
-#: classes/Command.php:203
-#: classes/Command.php:237
-#: lib/gallery.php:62
-#: lib/mailbox.php:36
-#: lib/subs.php:33
-#: lib/subs.php:95
-#: actions/showstream.php:157
-#: classes/Command.php:208
-#: classes/Command.php:242
-#: lib/gallery.php:85
-#: lib/subs.php:105
+#: ../actions/all.php:34 ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
+#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
+#: ../actions/replies.php:57 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:110 ../actions/userbyid.php:36
+#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
+#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
+#: actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95 actions/all.php:53 actions/allrss.php:66
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
+#: actions/foaf.php:41 actions/remotesubscribe.php:123
+#: actions/remotesubscribe.php:130 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/showstream.php:100 actions/userbyid.php:74
+#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
+#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
+#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Ningún usuario."
 
-#: ../actions/recoverpassword.php:211
-#: actions/recoverpassword.php:217
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "Non hai ningún usuario con isa dirección de correo ou nome de usuario."
 
-#: ../lib/gallery.php:80
-#: lib/gallery.php:85
-#: actions/users.php:59
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr "Ninguén para amosar"
 
-#: ../actions/recoverpassword.php:60
-#: actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr "Non é un código de recuperación."
 
-#: ../scripts/maildaemon.php:50
-#: scripts/maildaemon.php:50
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Non é un usuario rexistrado."
 
-#: ../lib/twitterapi.php:226
-#: ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#: lib/twitterapi.php:391
-#: lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-#: lib/twitterapi.php:423
-#: lib/twitterapi.php:450
-#: lib/twitterapi.php:534
+#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Non é un formato de datos soportado."
 
-#: ../actions/imsettings.php:167
-#: actions/imsettings.php:175
-#: actions/imsettings.php:180
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Non é un Identificador de Jabber válido"
 
-#: ../lib/openid.php:131
-#: lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Non é un enderezo OpenID válido."
 
-#: ../actions/emailsettings.php:185
-#: actions/emailsettings.php:203
-#: actions/emailsettings.php:209
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Non é unha dirección de correo válida"
 
-#: ../actions/register.php:63
-#: actions/register.php:70
-#: actions/register.php:79
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Non é un enderezo de correo válido."
 
-#: ../actions/profilesettings.php:91
-#: ../actions/register.php:71
-#: actions/profilesettings.php:206
-#: actions/register.php:78
-#: actions/profilesettings.php:225
-#: actions/register.php:87
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
+#: actions/editgroup.php:186 actions/newgroup.php:137
+#: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Non é un alcume válido."
 
-#: ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:159
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Non é un enderezo de perfil válido (servizos incorrectos)."
 
-#: ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Non é un enderezo de perfil válido (non está definido ningún XRDS)."
 
-#: ../actions/remotesubscribe.php:104
-#: actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Non é un enderezo de perfil válido (non ten documento YADIS)."
 
-#: ../actions/avatar.php:95
-#: actions/profilesettings.php:332
-#: actions/profilesettings.php:378
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Non é unha imaxe ou está corrupta."
 
 #: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
-#: actions/finishremotesubscribe.php:52
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Non está autorizado."
 
 #: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "¡Non esperaba esa resposta!"
 
-#: ../actions/twitapistatuses.php:422
-#: actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:304
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Non atopado"
 
-#: ../actions/finishaddopenid.php:29
-#: ../actions/logout.php:33
-#: ../actions/newnotice.php:29
-#: ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25
-#: ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
-#: actions/disfavor.php:29
-#: actions/favor.php:30
-#: actions/finishaddopenid.php:29
-#: actions/logout.php:33
-#: actions/newmessage.php:28
-#: actions/newnotice.php:29
-#: actions/subscribe.php:28
-#: actions/unsubscribe.php:25
-#: lib/deleteaction.php:38
-#: lib/settingsaction.php:27
-#: actions/block.php:31
-#: actions/misc.php:27
-#: actions/newnotice.php:30
-#: actions/nudge.php:30
-#: actions/subedit.php:31
-#: actions/unblock.php:31
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
+#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
+#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30
+#: actions/finishaddopenid.php:29 actions/logout.php:33
+#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
+#: actions/unsubscribe.php:25 lib/deleteaction.php:38
+#: lib/settingsaction.php:27 actions/block.php:59 actions/disfavor.php:61
+#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
+#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
+#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
+#: actions/unsubscribe.php:27 lib/deleteaction.php:66
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Non está logueado."
 
-#: ../lib/subs.php:91
-#: lib/subs.php:104
-#: lib/subs.php:117
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Non está suscrito!"
 
-#: ../actions/opensearch.php:35
-#: actions/opensearch.php:35
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Procura de Chíos"
 
-#: ../actions/showstream.php:82
-#: actions/showstream.php:82
-#: actions/showstream.php:111
-#: actions/showstream.php:118
-#: actions/showstream.php:123
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:180 actions/showstream.php:187
+#: actions/showstream.php:192
 #, php-format
 msgid "Notice feed for %s"
 msgstr "Fonte de chíos para %s"
 
-#: ../actions/shownotice.php:39
-#: actions/shownotice.php:39
-#: actions/shownotice.php:45
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "O chío non ten perfil"
 
-#: ../actions/showstream.php:316
-#: actions/showstream.php:331
-#: actions/showstream.php:379
+#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Chíos"
 
-#: ../actions/tag.php:35
-#: ../actions/tag.php:81
-#: actions/tag.php:35
-#: actions/tag.php:81
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Chíos tagueados con %s"
 
-#: ../actions/password.php:39
-#: actions/profilesettings.php:178
-#: actions/profilesettings.php:195
+#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Contrasinal antiga"
 
-#: ../lib/settingsaction.php:96
-#: ../lib/util.php:314
-#: lib/settingsaction.php:90
-#: lib/util.php:330
-#: actions/deleteprofile.php:247
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:66
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "Configuración de conta OpenID"
 
-#: ../lib/openid.php:180
-#: lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "Auto-Envío de OpenID"
 
-#: ../actions/finishaddopenid.php:99
-#: ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
-#: actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146
-#: actions/openidlogin.php:68
-#: actions/finishopenidlogin.php:150
-#: actions/openidlogin.php:76
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "Acceso OpenID"
 
-#: ../actions/openidlogin.php:65
-#: ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74
-#: actions/openidsettings.php:50
-#: actions/login.php:125
-#: actions/openidlogin.php:82
+#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "Enderezo OpenID"
 
-#: ../actions/finishaddopenid.php:42
-#: ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42
-#: actions/finishopenidlogin.php:109
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
+#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "Autenticación OpenID cancelada."
 
-#: ../actions/finishaddopenid.php:46
-#: ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46
-#: actions/finishopenidlogin.php:113
+#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
+#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "A autenticación OpenID fallou: %s"
 
-#: ../lib/openid.php:133
-#: lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Fallou o OpenID: %s"
 
-#: ../actions/openidsettings.php:144
-#: actions/openidsettings.php:153
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
+#: actions/openidsettings.php:231
 msgid "OpenID removed."
 msgstr "OpenID eliminado."
 
-#: ../actions/openidsettings.php:37
-#: actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
+#: actions/openidsettings.php:59
 msgid "OpenID settings"
 msgstr "Configuracións de OpenID"
 
-#: ../actions/invite.php:135
-#: actions/invite.php:143
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcionalmente engadir unha mensaxe persoal á invitación."
 
-#: ../actions/avatar.php:84
-#: actions/profilesettings.php:321
-#: actions/profilesettings.php:367
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Carga parcial."
 
-#: ../actions/finishopenidlogin.php:90
-#: ../actions/login.php:102
-#: ../actions/register.php:153
-#: ../lib/settingsaction.php:93
-#: actions/finishopenidlogin.php:96
-#: actions/login.php:102
-#: actions/register.php:167
-#: actions/login.php:109
-#: actions/register.php:194
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
+#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: actions/finishopenidlogin.php:96 actions/login.php:102
+#: actions/register.php:167 actions/finishopenidlogin.php:118
+#: actions/login.php:231 actions/register.php:372
+#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../actions/recoverpassword.php:288
-#: actions/recoverpassword.php:301
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "A contrasinal e a súa confirmación non coinciden."
 
-#: ../actions/recoverpassword.php:284
-#: actions/recoverpassword.php:297
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "A contrasinal debe ter 6 caracteres ou máis."
 
-#: ../actions/recoverpassword.php:261
-#: ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267
-#: actions/recoverpassword.php:269
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Petición de recuperación de contrasinal"
 
-#: ../actions/password.php:89
-#: ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408
-#: actions/recoverpassword.php:326
-#: actions/profilesettings.php:454
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Contrasinal gardada."
 
-#: ../actions/password.php:61
-#: ../actions/register.php:88
-#: actions/profilesettings.php:380
-#: actions/register.php:98
-#: actions/profilesettings.php:426
-#: actions/register.php:107
+#: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
+#: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "As contrasinais non coinciden"
 
-#: ../lib/searchaction.php:100
-#: lib/searchaction.php:100
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Xente"
 
-#: ../actions/opensearch.php:33
-#: actions/opensearch.php:33
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Procurar xente"
 
-#: ../actions/peoplesearch.php:33
-#: actions/peoplesearch.php:33
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Procurar xente."
 
-#: ../lib/stream.php:50
-#: lib/personal.php:50
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Persoal"
 
-#: ../actions/invite.php:133
-#: actions/invite.php:141
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Mensaxe persoal"
 
-#: ../actions/smssettings.php:69
-#: actions/smssettings.php:69
-#: actions/smspostsettings.php:49
-#: actions/smspostsettings.php:50
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Número de teléfono, sen puntuacións ou espazos, co código de área"
 
 #: ../actions/userauthorization.php:78
-#: actions/userauthorization.php:84
-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 \"Cancel\"."
-msgstr "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 \"Cancel\"."
+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 \"Cancel\"."
+msgstr ""
+"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 \"Cancel\"."
 
-#: ../actions/imsettings.php:73
-#: actions/imsettings.php:74
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
-#: ../actions/emailsettings.php:85
-#: ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
-#: actions/emailsettings.php:86
-#: actions/imsettings.php:68
-#: actions/smssettings.php:94
-#: actions/twittersettings.php:70
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../actions/emailsettings.php:162
-#: ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
-#: actions/emailsettings.php:180
-#: actions/imsettings.php:152
-#: actions/smssettings.php:171
-#: actions/emailsettings.php:186
-#: actions/imsettings.php:157
-#: actions/othersettings.php:179
-#: actions/smssettings.php:173
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Preferencias gardadas."
 
-#: ../actions/profilesettings.php:57
-#: actions/profilesettings.php:90
-#: actions/profilesettings.php:98
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Linguaxe preferida"
 
-#: ../lib/util.php:328
-#: lib/util.php:344
-#: lib/util.php:373
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../classes/Notice.php:95
-#: ../classes/Notice.php:106
-#: classes/Notice.php:109
-#: classes/Notice.php:119
-#: classes/Notice.php:139
-#: classes/Notice.php:149
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Aconteceu un erro ó gardar o chío."
 
-#: ../lib/settingsaction.php:84
-#: ../lib/stream.php:60
-#: lib/personal.php:60
-#: lib/settingsaction.php:84
-#: actions/deleteprofile.php:241
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:82
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "Enderezo de perfil"
 
-#: ../actions/profilesettings.php:34
-#: actions/profilesettings.php:32
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configuración de perfil"
 
-#: ../actions/postnotice.php:51
-#: ../actions/updateprofile.php:52
-#: actions/postnotice.php:52
-#: actions/updateprofile.php:53
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
+#: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Perfil descoñecido"
 
-#: ../actions/public.php:54
-#: actions/public.php:54
-#: actions/public.php:77
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
 msgstr "Sindicación do Fio Público"
 
-#: ../actions/public.php:33
-#: actions/public.php:33
-#: lib/stream.php:34
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Liña de tempo pública"
 
-#: ../actions/imsettings.php:79
-#: actions/imsettings.php:80
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar unha MicroID dende a miña dirección de Jabber/GTalk."
 
-#: ../actions/emailsettings.php:94
-#: actions/emailsettings.php:101
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar unha MicroID dende a miña dirección de correo."
 
-#: ../actions/tag.php:75
-#: ../actions/tag.php:76
-#: actions/tag.php:75
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
 msgid "Recent Tags"
 msgstr "Tags Recentes"
 
-#: ../actions/recoverpassword.php:166
-#: actions/recoverpassword.php:171
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Recuperar"
 
-#: ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Recuperar contrasinal"
 
-#: ../actions/recoverpassword.php:67
-#: actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+#: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr "Código de recuperación para usuario descoñecido."
 
-#: ../actions/register.php:142
-#: ../actions/register.php:193
-#: ../lib/util.php:312
-#: actions/register.php:152
-#: actions/register.php:207
-#: lib/util.php:328
-#: actions/register.php:181
-#: actions/register.php:234
-#: lib/util.php:354
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: actions/register.php:69 actions/register.php:436 lib/action.php:338
+#: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Rexistrar"
 
-#: ../actions/register.php:28
-#: actions/register.php:28
-#: actions/finishopenidlogin.php:173
+#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Non se permite o rexistro neste intre."
 
-#: ../actions/register.php:200
-#: actions/register.php:214
-#: actions/register.php:241
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Xa estas rexistrado!!"
 
-#: ../actions/userauthorization.php:120
-#: actions/userauthorization.php:127
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Rexeitar"
 
-#: ../actions/login.php:103
-#: ../actions/register.php:176
-#: actions/login.php:103
-#: actions/register.php:190
-#: actions/login.php:110
-#: actions/openidlogin.php:85
-#: actions/register.php:217
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Lembrarme"
 
-#: ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Non hai ningún perfil que coincida co perfil remoto"
 
-#: ../actions/remotesubscribe.php:65
-#: actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Suscrición remota"
 
-#: ../actions/emailsettings.php:47
-#: ../actions/emailsettings.php:75
-#: ../actions/imsettings.php:48
-#: ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50
-#: ../actions/smssettings.php:84
-#: actions/emailsettings.php:48
-#: actions/emailsettings.php:76
-#: actions/imsettings.php:49
-#: actions/openidsettings.php:108
-#: actions/smssettings.php:50
-#: actions/smssettings.php:84
-#: actions/twittersettings.php:59
-#: actions/smspostsettings.php:45
-#: actions/twittersettings.php:61
-#: actions/smspostsettings.php:46
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59 actions/emailsettings.php:101
+#: actions/emailsettings.php:134 actions/imsettings.php:102
+#: actions/openidsettings.php:166 actions/smssettings.php:103
+#: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../actions/openidsettings.php:68
-#: actions/openidsettings.php:69
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
 msgid "Remove OpenID"
 msgstr "Eliminar OpenID"
 
-#: ../actions/openidsettings.php:73
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first."
-msgstr "Eliminando o teu enderezo OpenID vaiche ser imposible acceder! Se queres eliminalo, primeiro engade outro enderezo OpenID."
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Eliminando o teu enderezo OpenID vaiche ser imposible acceder! Se queres "
+"eliminalo, primeiro engade outro enderezo OpenID."
 
-#: ../lib/stream.php:55
-#: lib/personal.php:55
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../actions/replies.php:47
-#: ../actions/repliesrss.php:76
-#: ../lib/stream.php:56
-#: actions/replies.php:47
-#: actions/repliesrss.php:62
-#: lib/personal.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
+#: actions/replies.php:116 actions/repliesrss.php:67
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Replies to %s"
 
-#: ../actions/recoverpassword.php:183
-#: actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Restaurar"
 
-#: ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Restaurar contrasinal"
 
-#: ../lib/settingsaction.php:99
-#: lib/settingsaction.php:93
-#: actions/deleteprofile.php:250
-#: actions/subscriptions.php:73
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
-#: ../actions/smssettings.php:67
-#: actions/smssettings.php:67
-#: actions/smspostsettings.php:38
-#: actions/smspostsettings.php:39
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "Número de Teléfono do SMS"
 
-#: ../actions/smssettings.php:33
-#: actions/smssettings.php:33
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
 msgid "SMS Settings"
 msgstr "Configuracións de SMS"
 
-#: ../lib/mail.php:219
-#: lib/mail.php:225
-#: lib/mail.php:220
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "Confirmación de SMS"
 
-#: ../actions/recoverpassword.php:182
-#: actions/recoverpassword.php:188
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Igual que a contrasinal de enriba"
 
-#: ../actions/register.php:156
-#: actions/register.php:170
-#: actions/register.php:197
+#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "A mesma contrasinal que arriba. Requerido."
 
-#: ../actions/emailsettings.php:97
-#: ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67
-#: ../actions/smssettings.php:100
-#: actions/emailsettings.php:104
-#: actions/imsettings.php:82
-#: actions/profilesettings.php:101
-#: actions/smssettings.php:100
-#: actions/twittersettings.php:83
-#: actions/emailsettings.php:108
-#: actions/imsettings.php:85
-#: actions/othersettings.php:56
-#: actions/profilesettings.php:118
-#: actions/subscriptions.php:74
-#: actions/tagother.php:100
-#: actions/twittersettings.php:82
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83 actions/emailsettings.php:182
+#: actions/facebooksettings.php:114 actions/imsettings.php:157
+#: actions/othersettings.php:117 actions/profilesettings.php:150
+#: actions/smssettings.php:169 actions/subscriptions.php:124
+#: actions/tagother.php:152 actions/twittersettings.php:161
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Gardar"
 
-#: ../lib/searchaction.php:84
-#: ../lib/util.php:300
-#: lib/searchaction.php:84
-#: lib/util.php:316
-#: lib/util.php:345
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Buscar"
 
-#: ../actions/noticesearch.php:80
-#: actions/noticesearch.php:85
-#: actions/noticesearch.php:84
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
 msgid "Search Stream Feed"
 msgstr "Procura no Fío"
 
-#: ../actions/noticesearch.php:30
-#: actions/noticesearch.php:30
-#: actions/noticesearch.php:29
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:57 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 "Procurar chíos en %%site.name%% polos seus contidos. Separa os termos de procura por espazos, deben ter 3 caracteres ou máis."
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Procurar chíos en %%site.name%% polos seus contidos. Separa os termos de "
+"procura por espazos, deben ter 3 caracteres ou máis."
 
-#: ../actions/peoplesearch.php:28
-#: actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 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 "Procurar xente en %%site.name%% pola seu nome, localización, ou intereses. Separa os termos por espazos; deben ter 3 caracteres ou máis."
+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 ""
+"Procurar xente en %%site.name%% pola seu nome, localización, ou intereses. "
+"Separa os termos por espazos; deben ter 3 caracteres ou máis."
 
-#: ../actions/smssettings.php:296
-#: actions/smssettings.php:304
-#: actions/smssettings.php:306
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Selecciona unha operadora"
 
-#: ../actions/invite.php:137
-#: ../lib/util.php:1172
-#: actions/invite.php:145
-#: lib/util.php:1306
-#: lib/util.php:1731
-#: lib/util.php:1705
-#: lib/util.php:2217
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Enviar"
 
-#: ../actions/emailsettings.php:73
-#: ../actions/smssettings.php:82
-#: actions/emailsettings.php:74
-#: actions/smssettings.php:82
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+#: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Enviar un correo a esta dirección para enviar novos chíos."
 
-#: ../actions/emailsettings.php:88
-#: actions/emailsettings.php:89
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Envíame chios de novas suscricións por email."
 
-#: ../actions/imsettings.php:70
-#: actions/imsettings.php:71
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviarme advertencias a través de Jabber/GTalk."
 
-#: ../actions/smssettings.php:97
-#: actions/smssettings.php:97
-msgid "Send me notices through SMS; I understand I may incur exorbitant charges from my carrier."
-msgstr "Enviarme chíos mediante SMS, entendo que a miña operadora poida cobrarme grandes facturas."
+#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Enviarme chíos mediante SMS, entendo que a miña operadora poida cobrarme "
+"grandes facturas."
 
-#: ../actions/imsettings.php:76
-#: actions/imsettings.php:77
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Envíame respostas a través de Jabber/GTalk da xente á que non estou suscrito."
+msgstr ""
+"Envíame respostas a través de Jabber/GTalk da xente á que non estou suscrito."
 
-#: ../lib/util.php:304
-#: lib/util.php:320
-#: lib/util.php:348
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../actions/profilesettings.php:192
-#: actions/profilesettings.php:307
-#: actions/profilesettings.php:353
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Configuracións gardadas."
 
-#: ../actions/tag.php:60
-#: actions/tag.php:60
-#: actions/tag.php:67
+#: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
 msgstr "Amoa os tags máis populares dende a semana pasada"
 
-#: ../actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:66
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
+#: actions/finishaddopenid.php:114
 msgid "Someone else already has this OpenID."
 msgstr "Alguen máis ten ese enderezo OpenID."
 
-#: ../actions/finishopenidlogin.php:42
-#: ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47
-#: actions/openidsettings.php:135
+#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
+#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
 msgid "Something weird happened."
 msgstr "Algo gordo aconteceu."
 
-#: ../scripts/maildaemon.php:58
-#: scripts/maildaemon.php:58
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Aivá, non se permiten correos entrantes."
 
-#: ../scripts/maildaemon.php:54
-#: scripts/maildaemon.php:54
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Ise é un enderezo IM incorrecto."
 
-#: ../lib/util.php:330
-#: lib/util.php:346
-#: lib/util.php:375
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Fonte"
 
-#: ../actions/showstream.php:296
-#: actions/showstream.php:311
-#: actions/showstream.php:359
-#: actions/misc.php:87
+#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: ../actions/finishopenidlogin.php:182
-#: ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188
-#: actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:199
-#: actions/finishopenidlogin.php:267
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "OpenID almacenado non atopado"
 
-#: ../actions/remotesubscribe.php:75
-#: ../actions/showstream.php:188
-#: ../actions/showstream.php:197
-#: actions/remotesubscribe.php:84
-#: actions/showstream.php:197
-#: actions/showstream.php:206
-#: actions/showstream.php:254
-#: lib/util.php:2137
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+#: actions/remotesubscribe.php:113 actions/showstream.php:376
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Subscribir"
 
-#: ../actions/showstream.php:313
-#: ../actions/subscribers.php:27
-#: actions/showstream.php:328
-#: actions/subscribers.php:27
-#: actions/showstream.php:376
-#: lib/gallery.php:136
-#: lib/gallery.php:137
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:436 actions/showstream.php:498
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Subscritores"
 
-#: ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Subscrición autorizada"
 
-#: ../actions/userauthorization.php:320
-#: actions/userauthorization.php:332
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Subscrición rexeitada"
 
-#: ../actions/showstream.php:230
-#: ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
-#: actions/showstream.php:240
-#: actions/showstream.php:322
-#: actions/subscriptions.php:27
-#: actions/showstream.php:288
-#: actions/showstream.php:370
-#: lib/gallery.php:131
-#: lib/gallery.php:132
+#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
+#: actions/showstream.php:407 actions/showstream.php:489
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subscricións"
 
-#: ../actions/avatar.php:87
-#: actions/profilesettings.php:324
-#: actions/profilesettings.php:370
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro."
 
-#: ../actions/tag.php:41
-#: ../lib/util.php:301
-#: actions/tag.php:41
-#: lib/util.php:317
-#: actions/profilesettings.php:90
-#: actions/showstream.php:382
-#: actions/tagother.php:96
-#: actions/tagother.php:162
-#: actions/tag.php:47
-#: lib/profilelist.php:126
-#: lib/profilelist.php:128
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
+#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Tags"
 
-#: ../lib/searchaction.php:104
-#: lib/searchaction.php:104
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Texto"
 
-#: ../actions/noticesearch.php:34
-#: actions/noticesearch.php:34
-#: actions/noticesearch.php:33
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Procura de texto"
 
-#: ../actions/openidsettings.php:140
-#: actions/openidsettings.php:149
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
+#: actions/openidsettings.php:227
 msgid "That OpenID does not belong to you."
 msgstr "Ese OpenID non che pertence."
 
-#: ../actions/confirmaddress.php:52
-#: actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
 msgstr "Esa dirección xa foi confirmada."
 
-#: ../actions/confirmaddress.php:43
-#: actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 msgstr "¡Ese código de confirmación non é para ti!"
 
-#: ../actions/emailsettings.php:191
-#: actions/emailsettings.php:209
-#: actions/emailsettings.php:215
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Este enderezo de correo xa pertence a outro usuario."
 
-#: ../actions/avatar.php:80
-#: actions/profilesettings.php:317
-#: actions/profilesettings.php:363
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Ese arquivo é demasiado grande."
 
-#: ../actions/imsettings.php:170
-#: actions/imsettings.php:178
-#: actions/imsettings.php:183
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Xa é a túa conta de Jabber."
 
-#: ../actions/emailsettings.php:188
-#: actions/emailsettings.php:206
-#: actions/emailsettings.php:212
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Xa é o teu enderezo de correo."
 
-#: ../actions/smssettings.php:188
-#: actions/smssettings.php:196
-#: actions/smspostsettings.php:83
-#: actions/smssettings.php:198
-#: actions/smspostsettings.php:88
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Xa é o teu número de teléfono."
 
-#: ../actions/imsettings.php:233
-#: actions/imsettings.php:241
-#: actions/imsettings.php:246
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Esa non é a túa conta Jabber."
 
-#: ../actions/emailsettings.php:249
-#: actions/emailsettings.php:267
-#: actions/emailsettings.php:271
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Esa non é a túa dirección de correo."
 
-#: ../actions/smssettings.php:257
-#: actions/smssettings.php:265
-#: actions/smspostsettings.php:113
-#: actions/smssettings.php:267
-#: actions/smspostsettings.php:118
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Ese non é o teu número de teléfono."
 
-#: ../actions/emailsettings.php:226
-#: ../actions/imsettings.php:210
-#: actions/emailsettings.php:244
-#: actions/imsettings.php:218
-#: actions/emailsettings.php:248
-#: actions/imsettings.php:223
+#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Esa é unha enderezo IM incorrecto."
 
-#: ../actions/smssettings.php:233
-#: actions/smssettings.php:241
-#: actions/smssettings.php:243
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Ese é un número de confirmación incorrecto."
 
-#: ../actions/smssettings.php:191
-#: actions/smssettings.php:199
-#: actions/smspostsettings.php:86
-#: actions/smssettings.php:201
-#: actions/smspostsettings.php:91
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "O número de teléfono xa pertence a outro usuario."
 
-#: ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
-#: actions/newnotice.php:61
-#: actions/newsmsnotice.php:73
-#: actions/twitapistatuses.php:271
-#: actions/newsmsnotice.php:79
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
-msgstr "Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres."
+msgstr ""
+"Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres."
 
-#: ../actions/twitapiaccount.php:74
-#: actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:58
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
-msgstr "Iso é demasiado longo. O tamaño máximo para un chío é de 255 caracteres."
+msgstr ""
+"Iso é demasiado longo. O tamaño máximo para un chío é de 255 caracteres."
 
-#: ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "A dirección \"%s\" xa foi confirmada para a túa conta."
 
-#: ../actions/emailsettings.php:264
-#: ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
-#: actions/emailsettings.php:282
-#: actions/imsettings.php:258
-#: actions/smssettings.php:282
-#: actions/emailsettings.php:286
-#: actions/imsettings.php:263
-#: actions/smspostsettings.php:128
-#: actions/smssettings.php:284
-#: actions/smspostsettings.php:133
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "Enderezo eliminado."
 
-#: ../actions/userauthorization.php:312
-#: actions/userauthorization.php:324
-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 "A subscrición foi autorizada, pero ningunha URL de retorno foi proporcionada. Comproba coas instruccións do sitio para máis detalles en como autorizar subscricións. O teu token de subscrición é:"
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
+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 ""
+"A subscrición foi autorizada, pero ningunha URL de retorno foi "
+"proporcionada. Comproba coas instruccións do sitio para máis detalles en "
+"como autorizar subscricións. O teu token de subscrición é:"
 
-#: ../actions/userauthorization.php:322
-#: actions/userauthorization.php:334
-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 "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."
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
+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 ""
+"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."
 
-#: ../actions/subscribers.php:35
-#: actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Esa é a xente que escoita os chíos de %s."
 
-#: ../actions/subscribers.php:33
-#: actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Esa é a xente que escoita os teus chíos."
 
-#: ../actions/subscriptions.php:35
-#: actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Esta é a xente á que lle estas a escoitar os chíos %s."
 
-#: ../actions/subscriptions.php:33
-#: actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Esa é a xente á que lle estas a escoitar os seus chíos"
 
-#: ../actions/invite.php:89
-#: actions/invite.php:96
-msgid "These people are already users and you were automatically subscribed to them:"
+#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
 msgstr "Esta xente xa é usuario e ti foches suscrito automaticamente a eles:"
 
-#: ../actions/recoverpassword.php:88
-#: actions/recoverpassword.php:91
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Ese código de confirmación é demasiado antigo. Comeza de novo."
 
-#: ../lib/openid.php:195
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider."
-msgstr "Este formulario debería enviarse automáticamente. Se non é así, fai clic no botón de enviar para ir ó teu proveedro OpenID."
-
-#: ../actions/finishopenidlogin.php:56
-#: actions/finishopenidlogin.php:61
-#, php-format
-msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one."
-msgstr "Esta é a primeria vez que accedes a %s polo que debes conectar o teu enderezo OpenID á conta local. Podes ademáis crear unha nova conta, ou conectarte cunha existente, se xa tes unha."
-
-#: ../actions/twitapifriendships.php:108
-#: ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127
-#: actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-#: actions/twitapifavorites.php:94
-#: actions/twitapifriendships.php:82
-#: actions/twitapistatuses.php:428
+#: ../lib/openid.php:195 lib/openid.php:206
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Este formulario debería enviarse automáticamente. Se non é así, fai clic no "
+"botón de enviar para ir ó teu proveedro OpenID."
+
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your OpenID "
+"to a local account. You can either create a new account, or connect with "
+"your existing account, if you have one."
+msgstr ""
+"Esta é a primeria vez que accedes a %s polo que debes conectar o teu "
+"enderezo OpenID á conta local. Podes ademáis crear unha nova conta, ou "
+"conectarte cunha existente, se xa tes unha."
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
+#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Este método require un POST ou DELETE."
 
-#: ../actions/twitapiaccount.php:65
-#: ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-#: actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114
-#: actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-#: actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:117
-#: actions/twitapifriendships.php:30
-#: actions/twitapistatuses.php:239
+#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
+#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Este método require un POST."
 
-#: ../lib/util.php:164
-#: lib/util.php:246
-#: lib/util.php:263
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
 
-#: ../actions/profilesettings.php:63
-#: actions/profilesettings.php:96
-#: actions/profilesettings.php:109
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Fuso Horario"
 
-#: ../actions/profilesettings.php:107
-#: actions/profilesettings.php:222
-#: actions/profilesettings.php:241
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Fuso Horario non seleccionado"
 
-#: ../actions/remotesubscribe.php:43
-#: actions/remotesubscribe.php:51
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: 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 "Para subscribirse, podes [acceder](%%action.login%%), ou [rexistrar](%%action.register%%) unha nova conta. Se xa tes unha conta nun  [sitio de microblogaxe compatíbel](%%doc.openmublog%%),  insire a dirección do perfil abaixo."
-
-#: ../actions/twitapifriendships.php:163
-#: actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:128
+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 ""
+"Para subscribirse, podes [acceder](%%action.login%%), ou [rexistrar](%%"
+"action.register%%) unha nova conta. Se xa tes unha conta nun  [sitio de "
+"microblogaxe compatíbel](%%doc.openmublog%%),  insire a dirección do perfil "
+"abaixo."
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
-msgstr "Dous identificadores de usuario ou nomes_en_pantalla deben ser proporcionados."
-
-#: ../actions/profilesettings.php:48
-#: ../actions/register.php:169
-#: actions/profilesettings.php:81
-#: actions/register.php:183
-#: actions/profilesettings.php:83
-#: actions/register.php:210
+msgstr ""
+"Dous identificadores de usuario ou nomes_en_pantalla deben ser "
+"proporcionados."
+
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
 
-#: ../actions/remotesubscribe.php:74
-#: actions/remotesubscribe.php:83
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel"
 
-#: ../actions/emailsettings.php:130
-#: ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39
-#: ../actions/smssettings.php:135
-#: actions/emailsettings.php:144
-#: actions/imsettings.php:118
-#: actions/recoverpassword.php:39
-#: actions/smssettings.php:143
-#: actions/twittersettings.php:108
-#: actions/emailsettings.php:148
-#: actions/imsettings.php:121
-#: actions/othersettings.php:146
-#: actions/smspostsettings.php:64
-#: actions/smssettings.php:145
-#: actions/twittersettings.php:199
-#: actions/smspostsettings.php:69
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108 actions/avatarsettings.php:258
+#: actions/emailsettings.php:242 actions/grouplogo.php:317
+#: actions/imsettings.php:214 actions/recoverpassword.php:44
+#: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Envio de formulario non esperada."
 
-#: ../actions/recoverpassword.php:276
-#: actions/recoverpassword.php:289
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Restauración de contrasinal non esperada."
 
-#: ../index.php:57
-#: index.php:57
+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Acción descoñecida"
 
 #: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
-#: actions/finishremotesubscribe.php:59
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
 msgstr "Versión de protocolo OMB descoñecida."
 
-#: ../lib/util.php:269
-#: lib/util.php:285
-#: lib/util.php:302
-msgid "Unless otherwise specified, contents of this site are copyright by the contributors and available under the "
-msgstr "Aínda que especifiques outro, os contidos de este sitio teñen copyright polos contribuidores e está dispoñible baixo "
+#: ../lib/util.php:269 lib/util.php:285
+msgid ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
+msgstr ""
+"Aínda que especifiques outro, os contidos de este sitio teñen copyright "
+"polos contribuidores e está dispoñible baixo "
 
-#: ../actions/confirmaddress.php:48
-#: actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tipo de enderezo %s non recoñecido"
 
-#: ../actions/showstream.php:209
-#: actions/showstream.php:219
-#: actions/showstream.php:267
-#: lib/util.php:2153
+#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Eliminar subscrición"
 
-#: ../actions/postnotice.php:44
-#: ../actions/updateprofile.php:45
-#: actions/postnotice.php:45
-#: actions/updateprofile.php:46
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
+#: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Versión OMB non soportada"
 
-#: ../actions/avatar.php:105
-#: actions/profilesettings.php:342
-#: actions/profilesettings.php:388
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Formato de ficheiro de imaxe non soportado."
 
-#: ../lib/settingsaction.php:100
-#: lib/settingsaction.php:94
-#: actions/deleteprofile.php:251
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Chíos dende SMS"
 
-#: ../lib/settingsaction.php:103
-#: lib/settingsaction.php:97
-#: actions/deleteprofile.php:254
-#: lib/settingsaction.php:101
-#: lib/settingsaction.php:103
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Chíos dende mensaxería instantánea (IM)"
 
-#: ../actions/twitapistatuses.php:241
-#: actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:126
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualizacións dende %1$s e amigos en %2$s!"
 
-#: ../actions/twitapistatuses.php:341
-#: actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:198
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualizacións dende %1$s en %2$s!"
 
-#: ../actions/avatar.php:68
-#: actions/profilesettings.php:161
-#: actions/profilesettings.php:178
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Subir"
 
 #: ../actions/avatar.php:27
-msgid "Upload a new \"avatar\" (user image) here. You can't edit the picture after you upload it, so make sure it's more or less square. It must be under the site license, also. Use a picture that belongs to you and that you want to share."
-msgstr "Sube un novo \"avatar\" (imaxe de usuario) dende aquí. Non podes editar a imaxe despois de subila, polo que asegurate de que é máis ou menos cadrado. Debe estar baixo a licenza do sistio. Emprega unha imaxe que che pertenza e que queiras compartir."
+msgid ""
+"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
+"you upload it, so make sure it's more or less square. It must be under the "
+"site license, also. Use a picture that belongs to you and that you want to "
+"share."
+msgstr ""
+"Sube un novo \"avatar\" (imaxe de usuario) dende aquí. Non podes editar a "
+"imaxe despois de subila, polo que asegurate de que é máis ou menos cadrado. "
+"Debe estar baixo a licenza do sistio. Emprega unha imaxe que che pertenza e "
+"que queiras compartir."
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
 msgstr "Subir unha nova imaxe de usuario"
 
-#: ../actions/invite.php:114
-#: actions/invite.php:121
-msgid "Use this form to invite your friends and colleagues to use this service."
-msgstr "Emprega este formulario para invitar ós teus amigos e colegas a empregar este servizo."
-
-#: ../actions/register.php:159
-#: ../actions/register.php:162
-#: actions/register.php:173
-#: actions/register.php:176
-#: actions/register.php:200
-#: actions/register.php:203
+#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Emprega este formulario para invitar ós teus amigos e colegas a empregar "
+"este servizo."
+
+#: ../actions/register.php:159 ../actions/register.php:162
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
-msgstr "Empregado só para actualizacións, novidades, e recuperación de contrasinais"
+msgstr ""
+"Empregado só para actualizacións, novidades, e recuperación de contrasinais"
 
 #: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
-#: actions/finishremotesubscribe.php:92
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
 msgstr "O usuario  que está sendo escoitado non existe."
 
-#: ../actions/all.php:41
-#: ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47
-#: ../actions/replies.php:41
-#: ../actions/showstream.php:44
-#: ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319
-#: ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
-#: actions/all.php:41
-#: actions/avatarbynickname.php:48
-#: actions/foaf.php:47
-#: actions/replies.php:41
-#: actions/showfavorites.php:41
-#: actions/showstream.php:44
-#: actions/twitapiaccount.php:80
-#: actions/twitapifavorites.php:68
-#: actions/twitapistatuses.php:235
-#: actions/twitapistatuses.php:609
-#: actions/twitapiusers.php:87
-#: lib/mailbox.php:50
-#: actions/showstream.php:57
-#: actions/twitapiaccount.php:66
-#: actions/twitapifavorites.php:40
-#: actions/twitapistatuses.php:163
-#: actions/twitapistatuses.php:492
-#: actions/twitapiusers.php:53
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:47 ../actions/replies.php:41
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
+#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50
+#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
+#: actions/showstream.php:107 actions/twitapiaccount.php:70
+#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
+#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
+#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "O usuario non ten perfil."
 
-#: ../actions/remotesubscribe.php:71
-#: actions/remotesubscribe.php:80
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Alcume de usuario"
 
-#: ../actions/twitapiusers.php:75
-#: actions/twitapiusers.php:80
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
 msgstr "Usuario non atopado."
 
-#: ../actions/profilesettings.php:63
-#: actions/profilesettings.php:96
-#: actions/profilesettings.php:109
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "En que fuso horario estas normalmente?"
 
-#: ../lib/util.php:1159
-#: lib/util.php:1293
-#: lib/util.php:1689
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "¿Que pasa, %s?"
 
-#: ../actions/profilesettings.php:54
-#: ../actions/register.php:175
-#: actions/profilesettings.php:87
-#: actions/register.php:189
-#: actions/profilesettings.php:89
-#: actions/register.php:216
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
 
-#: ../actions/updateprofile.php:128
-#: actions/updateprofile.php:129
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo de imaxe incorrecto para '%s'"
 
-#: ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Tamaño de imaxe incorrecto en '%s'"
 
-#: ../actions/deletenotice.php:63
-#: ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64
-#: actions/deletenotice.php:79
-#: actions/block.php:105
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:148 actions/deletenotice.php:122
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Si"
 
-#: ../actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:64
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
+#: actions/finishaddopenid.php:112
 msgid "You already have this OpenID!"
 msgstr "¡Xa tes esa OpenID!"
 
-#: ../actions/deletenotice.php:37
-#: actions/deletenotice.php:37
-msgid "You are about to permanently delete a notice.  Once this is done, it cannot be undone."
-msgstr "Vas a eliminar permanentemente este chío. Unha vez feito, xa non hai volta atrás... Quedas avisado!"
+#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
+msgid ""
+"You are about to permanently delete a notice.  Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Vas a eliminar permanentemente este chío. Unha vez feito, xa non hai volta "
+"atrás... Quedas avisado!"
 
-#: ../actions/recoverpassword.php:31
-#: actions/recoverpassword.php:31
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
+#: actions/recoverpassword.php:36
 msgid "You are already logged in!"
 msgstr "¡Xa estás logueado!"
 
-#: ../actions/invite.php:81
-#: actions/invite.php:88
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Xa estas suscrito a estes usuarios:"
 
-#: ../actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:102
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "No tes amigos con un usuario específico."
 
@@ -3075,57 +3062,63 @@ msgstr "No tes amigos con un usuario específico."
 msgid "You can change your password here. Choose a good one!"
 msgstr "Podes cambiar a túa contrasinal aquí. ¡Escolle unha boa!"
 
-#: ../actions/register.php:135
-#: actions/register.php:145
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr "Podes crear unha nova conta para comezar a escribir chíos."
 
-#: ../actions/smssettings.php:28
-#: actions/smssettings.php:28
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Podes recibir mensaxes SMS a través do email dende %%site.name%%."
 
-#: ../actions/openidsettings.php:86
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"."
-msgstr "Podes eliminar unha OpenID da túa conta facendo clic no botón marcado \"Eliminar\"."
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Podes eliminar unha OpenID da túa conta facendo clic no botón marcado "
+"\"Eliminar\"."
 
-#: ../actions/imsettings.php:28
-#: actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
-msgid "You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below."
-msgstr "Podes enviar e recibir chíos a través de Jabber/GTalk [mensaxes instantáneos](%%doc.im%%). Configura a túa conta e configuracións abaixo."
-
-#: ../actions/profilesettings.php:27
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here so people know more about you."
-msgstr "Podes actualizar a túa información do perfil persoal aquí para que a xente che poida coñecer mellor."
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Podes enviar e recibir chíos a través de Jabber/GTalk [mensaxes instantáneos]"
+"(%%doc.im%%). Configura a túa conta e configuracións abaixo."
 
-#: ../actions/finishremotesubscribe.php:31
-#: ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31
-#: actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:83
-#: actions/finishremotesubscribe.php:99
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Podes actualizar a túa información do perfil persoal aquí para que a xente "
+"che poida coñecer mellor."
+
+#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
+#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "¡Podes empregar a túa subscrición local!"
 
-#: ../actions/finishopenidlogin.php:33
-#: ../actions/register.php:61
-#: actions/finishopenidlogin.php:38
-#: actions/register.php:68
-#: actions/register.php:77
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
 
-#: ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Non nos enviaches ese perfil"
 
-#: ../lib/mail.php:147
-#: lib/mail.php:141
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -3146,231 +3139,208 @@ msgstr ""
 "Sempre teu...,\n"
 "%4$s"
 
-#: ../actions/twitapistatuses.php:612
-#: actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:455
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Non deberías eliminar o estado de outro usuario"
 
-#: ../actions/invite.php:31
-#: actions/invite.php:31
+#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
-#: ../actions/invite.php:103
-#: actions/invite.php:110
-msgid "You will be notified when your invitees accept the invitation and register on the site. Thanks for growing the community!"
-msgstr "Notificaráseche cando os teus invitados acepten unha invitación e se rexistren neste sitio. Grazas por facer crecer o gremio lareteiro!"
+#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
+"Notificaráseche cando os teus invitados acepten unha invitación e se "
+"rexistren neste sitio. Grazas por facer crecer o gremio lareteiro!"
 
-#: ../actions/recoverpassword.php:149
-#: actions/recoverpassword.php:154
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Foiches identificado. Insire unha nova contrasinal abaixo."
 
-#: ../actions/openidlogin.php:67
-#: actions/openidlogin.php:76
-#: actions/login.php:127
-#: actions/openidlogin.php:84
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "O teu enderezo OpenID"
 
-#: ../actions/recoverpassword.php:164
-#: actions/recoverpassword.php:169
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "O teu alcume neste servidor, ou o teu enderezo rexistrado."
 
-#: ../actions/openidsettings.php:28
-#: actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user account.  Manage your associated OpenIDs from here."
-msgstr "[OpenID](%%doc.openid%%) permiteche acceder en moitos sitios coa mesma conta. Xestina os teus OpenIDs asociados dende aquí."
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
+"account.  Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) permiteche acceder en moitos sitios coa mesma "
+"conta. Xestina os teus OpenIDs asociados dende aquí."
 
-#: ../lib/util.php:943
-#: lib/util.php:992
-#: lib/util.php:1349
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "fai uns segundos"
 
-#: ../lib/util.php:955
-#: lib/util.php:1004
-#: lib/util.php:1361
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "fai %d días"
 
-#: ../lib/util.php:951
-#: lib/util.php:1000
-#: lib/util.php:1357
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "fai %d horas"
 
-#: ../lib/util.php:947
-#: lib/util.php:996
-#: lib/util.php:1353
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fai %d minutos"
 
-#: ../lib/util.php:959
-#: lib/util.php:1008
-#: lib/util.php:1365
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "fai %d meses"
 
-#: ../lib/util.php:953
-#: lib/util.php:1002
-#: lib/util.php:1359
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "fai un día"
 
-#: ../lib/util.php:945
-#: lib/util.php:994
-#: lib/util.php:1351
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "fai un minuto"
 
-#: ../lib/util.php:957
-#: lib/util.php:1006
-#: lib/util.php:1363
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "fai un mes"
 
-#: ../lib/util.php:961
-#: lib/util.php:1010
-#: lib/util.php:1367
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "fai un ano"
 
-#: ../lib/util.php:949
-#: lib/util.php:998
-#: lib/util.php:1355
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "fai unha hora"
 
-#: ../actions/showstream.php:423
-#: ../lib/stream.php:132
-#: actions/showstream.php:441
-#: lib/stream.php:99
-#: lib/noticelist.php:211
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
 msgstr "eliminar"
 
-#: ../actions/noticesearch.php:130
-#: ../actions/showstream.php:408
-#: ../lib/stream.php:117
-#: actions/noticesearch.php:136
-#: actions/showstream.php:426
-#: lib/stream.php:84
-#: actions/noticesearch.php:135
-#: lib/facebookaction.php:202
-#: lib/noticelist.php:189
+#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
+#: ../lib/stream.php:117 actions/noticesearch.php:136
+#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
 msgid "in reply to..."
 msgstr "en contestación a..."
 
-#: ../actions/noticesearch.php:137
-#: ../actions/showstream.php:415
-#: ../lib/stream.php:124
-#: actions/noticesearch.php:143
-#: actions/showstream.php:433
-#: lib/stream.php:91
-#: actions/noticesearch.php:142
-#: lib/noticelist.php:199
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "contestar"
 
-#: ../actions/password.php:44
-#: actions/profilesettings.php:183
-#: actions/profilesettings.php:200
+#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "igual á contrasinal de enriba"
 
-#: ../actions/twitapistatuses.php:755
-#: actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:543
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "tipo de ficheiro non soportado"
 
-#: ../lib/util.php:1309
-#: lib/util.php:1443
-#: lib/facebookaction.php:251
-#: lib/util.php:1842
+#: ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
 msgstr "« Despois"
 
-#: actions/deletenotice.php:74
-#: actions/disfavor.php:43
-#: actions/emailsettings.php:127
-#: actions/favor.php:45
-#: actions/finishopenidlogin.php:33
-#: actions/imsettings.php:105
-#: actions/invite.php:46
-#: actions/newmessage.php:45
-#: actions/openidlogin.php:36
-#: actions/openidsettings.php:123
-#: actions/profilesettings.php:47
-#: actions/recoverpassword.php:282
-#: actions/register.php:42
-#: actions/remotesubscribe.php:40
-#: actions/smssettings.php:124
-#: actions/subscribe.php:44
-#: actions/twittersettings.php:97
-#: actions/unsubscribe.php:41
-#: actions/userauthorization.php:35
-#: actions/block.php:38
-#: actions/deleteprofile.php:127
-#: actions/disfavor.php:47
-#: actions/emailsettings.php:131
-#: actions/favor.php:49
-#: actions/imsettings.php:108
-#: actions/login.php:45
-#: actions/newmessage.php:44
-#: actions/newnotice.php:36
-#: actions/nudge.php:47
-#: actions/othersettings.php:139
-#: actions/profilesettings.php:49
-#: actions/smssettings.php:126
-#: actions/subedit.php:38
-#: actions/tagother.php:113
-#: actions/twittersettings.php:188
-#: actions/unblock.php:38
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
+#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
+#: actions/openidlogin.php:37 actions/recoverpassword.php:316
+#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 
-#: actions/disfavor.php:55
+#: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "Este chío non é un favorito!"
 
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Non se puido eliminar o favorito."
 
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
 msgstr "Gostame"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
 
-#: actions/emailsettings.php:95
+#: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
 
-#: actions/favor.php:53
-#: actions/twitapifavorites.php:142
-#: actions/favor.php:54
-#: actions/twitapifavorites.php:115
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Este chío xa é un favorito!"
 
-#: actions/favor.php:60
-#: actions/twitapifavorites.php:151
-#: classes/Command.php:132
-#: actions/favor.php:61
-#: actions/twitapifavorites.php:122
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Non se puido crear o favorito."
 
@@ -3378,104 +3348,109 @@ msgstr "Non se puido crear o favorito."
 msgid "Disfavor"
 msgstr "Non me gosta"
 
-#: actions/favoritesrss.php:60
-#: actions/showfavorites.php:47
-#: actions/favoritesrss.php:62
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s chíos favoritos"
 
-#: actions/favoritesrss.php:64
-#: actions/favoritesrss.php:66
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Fonte para os chíos favoritos de %s"
 
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr "Band. Entrada para %s - páxina %d"
 
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr "Band. Entrada para %s"
 
-#: actions/inbox.php:53
+#: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Esta é a túa bandexa de entrada, aquí móstranse as túas mensaxes privadas."
+msgstr ""
+"Esta é a túa bandexa de entrada, aquí móstranse as túas mensaxes privadas."
 
-#: actions/invite.php:178
+#: actions/invite.php:178 actions/invite.php:213
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
 msgstr "Acabas de invitar a %1$s a unirse a %2$s (%3$s).\n"
 
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
+#: actions/register.php:416
 msgid "Automatically login in the future; "
 msgstr "Loguearse automáticamente no futuro:"
 
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
 msgstr "Por razóns de seguranza, por favor re-insire o teu "
 
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
 msgstr "Accede co teu nome de usuario e contrasinal."
 
-#: actions/newmessage.php:58
-#: actions/twitapidirect_messages.php:130
-#: actions/newmessage.php:60
-#: actions/twitapidirect_messages.php:136
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
-msgstr "Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres."
+msgstr ""
+"Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres."
 
-#: actions/newmessage.php:65
-#: actions/newmessage.php:68
+#: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Non se especificou ningún destinatario"
 
-#: actions/newmessage.php:68
-#: actions/newmessage.php:113
-#: classes/Command.php:206
-#: actions/newmessage.php:71
-#: actions/newmessage.php:116
-#: classes/Command.php:211
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206 actions/newmessage.php:131
+#: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Non podes enviar mensaxes a este usurio."
 
-#: actions/newmessage.php:71
-#: actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
-#: actions/newmessage.php:74
-#: actions/twitapidirect_messages.php:153
-#: classes/Command.php:214
-msgid "Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Non te envies mensaxes a ti mesmo!! só fala contigo mesmo baixiño, senón vante tomar por tolo."
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"Non te envies mensaxes a ti mesmo!! só fala contigo mesmo baixiño, senón "
+"vante tomar por tolo."
 
-#: actions/newmessage.php:108
-#: actions/microsummary.php:32
-#: actions/newmessage.php:111
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "Non é o usuario"
 
-#: actions/newmessage.php:117
-#: actions/newmessage.php:120
+#: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nova mensaxe"
 
-#: actions/noticesearch.php:95
-#: actions/noticesearch.php:94
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
 msgstr "Chío sen perfil coincidente"
 
-#: actions/openidsettings.php:28
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr "[OpenID](%%doc.openid%%) permiteche acceder en moitos sitios"
 
-#: actions/openidsettings.php:46
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
 msgstr "Se queres engadir un enderezo OpenID á tua conta, "
 
@@ -3483,185 +3458,208 @@ msgstr "Se queres engadir un enderezo OpenID á tua conta, "
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr "Eliminando o teu enderezo OpenID serache imposíbel acceder!"
 
-#: actions/openidsettings.php:87
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
 msgstr "Podes eliminar un identificador OpenID da túa conta "
 
-#: actions/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Band. Saída para %s - páxina %d"
 
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Band. Saída para %s"
 
-#: actions/outbox.php:53
+#: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
-msgstr "Esta é a túa band. saída, que mostra as mensaxes privadas que enviaches."
+msgstr ""
+"Esta é a túa band. saída, que mostra as mensaxes privadas que enviaches."
 
-#: actions/peoplesearch.php:28
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
-msgid "Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Procurar xente en %%site.name%% polo seu nome, localización, ou intereses. "
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+"Procurar xente en %%site.name%% polo seu nome, localización, ou intereses. "
 
-#: actions/profilesettings.php:27
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
 msgid "You can update your personal profile info here "
 msgstr "Podes actualizar a túa información do perfil persoal aquí"
 
-#: actions/profilesettings.php:115
-#: actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159
-#: actions/userrss.php:76
-#: actions/profilesettings.php:132
-#: actions/remotesubscribe.php:333
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
+#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
+#: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Usuario sen un perfil que coincida."
 
-#: actions/recoverpassword.php:91
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
 msgstr "Ese código de confirmación é demasiado antigo."
 
-#: actions/recoverpassword.php:141
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
 msgstr "Se esquenciches ou perdeches a túa"
 
-#: actions/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
 msgstr "Foches identificado. Insire unha "
 
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
 msgstr "O teu alcume neste servidor, "
 
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
 msgstr "Instruccións para recuperar a túa contrasinal."
 
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
 msgstr "A nova contrasinal foi gardada correctamente."
 
-#: actions/register.php:95
-#: actions/register.php:104
+#: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "A contrasinal debe ter 6 caracteres ou máis."
 
 #: actions/register.php:216
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to..."
-msgstr "Noraboa, %s! E benvido a %%%%site.name%%%%. Dende aquí, igual queres..."
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+"Noraboa, %s! E benvido a %%%%site.name%%%%. Dende aquí, igual queres..."
 
 #: actions/register.php:227
 msgid "(You should receive a message by email momentarily, with "
 msgstr "(Deberías recibir unha mensaxe no teu email nun intre, con"
 
-#: actions/remotesubscribe.php:51
+#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
 msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "Para suscribirse, podes [loguearte](%%action.login%%),"
 
-#: actions/showfavorites.php:61
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Fonte para os favoritos de %s"
 
-#: actions/showfavorites.php:84
-#: actions/twitapifavorites.php:85
-#: actions/showfavorites.php:88
-#: actions/twitapifavorites.php:57
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Non se pode "
 
-#: actions/showmessage.php:33
+#: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
 msgstr "Non existe a mensaxe."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Só o emisor e destinatario poden ler esta mensaxe."
 
-#: actions/showmessage.php:61
+#: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Mensaxe de %1$s en %2$s"
 
-#: actions/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mensaxe dende %1$s en %2$s"
 
 #: actions/showstream.php:154
-#: lib/util.php:2164
 msgid "Send a message"
 msgstr "Enviar unha mensaxe"
 
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
 msgstr "Operadora móbil do teu teléfono."
 
-#: actions/twitapidirect_messages.php:76
-#: actions/twitapidirect_messages.php:64
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Mensaxes directas para %s"
 
-#: actions/twitapidirect_messages.php:77
-#: actions/twitapidirect_messages.php:65
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Tódalas mensaxes directas enviadas a %s"
 
-#: actions/twitapidirect_messages.php:81
-#: actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Mensaxes Directas que Enviaches."
 
-#: actions/twitapidirect_messages.php:82
-#: actions/twitapidirect_messages.php:70
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Tódalas mensaxes directas enviadas dende %s"
 
 #: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:132
+#: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Non hai mensaxes de texto!"
 
 #: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:145
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Usuario destinatario non atopado."
 
 #: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:148
+#: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo."
+msgstr ""
+"Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo."
 
-#: actions/twitapifavorites.php:92
-#: actions/twitapifavorites.php:64
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoritos dende %s"
 
-#: actions/twitapifavorites.php:95
-#: actions/twitapifavorites.php:67
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s updates favorited by %s / %s."
 
-#: actions/twitapifavorites.php:187
-#: lib/mail.php:275
-#: actions/twitapifavorites.php:158
-#: lib/mail.php:293
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s gustoulle o teu chío"
 
-#: actions/twitapifavorites.php:188
-#: lib/mail.php:276
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:165
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
@@ -3671,21 +3669,24 @@ msgstr ""
 "\n"
 
 #: actions/twittersettings.php:27
-msgid "Add your Twitter account to automatically send your notices to Twitter, "
-msgstr "Engade a túa conta de Twitter para enviar automáticamente os teus chíos a Twitter."
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+"Engade a túa conta de Twitter para enviar automáticamente os teus chíos a "
+"Twitter."
 
-#: actions/twittersettings.php:41
-#: actions/twittersettings.php:43
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Configuracións de Twitter"
 
-#: actions/twittersettings.php:48
-#: actions/twittersettings.php:50
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Conta de Twitter"
 
-#: actions/twittersettings.php:56
-#: actions/twittersettings.php:58
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Conta de twitter verificada actualmente."
 
@@ -3693,7 +3694,8 @@ msgstr "Conta de twitter verificada actualmente."
 msgid "Twitter Username"
 msgstr "Nome de usuario en Twitter"
 
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Sen espazos, anda..."
 
@@ -3701,230 +3703,242 @@ msgstr "Sen espazos, anda..."
 msgid "Twitter Password"
 msgstr "Contrasinal de Twitter"
 
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Enviar automáticamente os meus chíos a Twitter."
 
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Enviar respostas \"@\" locais a Twitter."
 
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Suscribirse ós meus amigos de Twitter aquí."
 
-#: actions/twittersettings.php:122
-#: actions/twittersettings.php:216
-msgid "Username must have only numbers, upper- and lowercase letters, and underscore (_). 15 chars max."
-msgstr "O nome de usuario debe ter só letras, minúsculas e maiúsculas, e números, e sen espazos."
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+"O nome de usuario debe ter só letras, minúsculas e maiúsculas, e números, e "
+"sen espazos."
 
-#: actions/twittersettings.php:128
-#: actions/twittersettings.php:221
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "Non se puideron verificar as túas credenciais en Twitter!"
 
 #: actions/twittersettings.php:137
-#: actions/twittersettings.php:228
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr "Non se puido recoller información da túa conta  \"%s\" en Twitter."
 
-#: actions/twittersettings.php:151
-#: actions/twittersettings.php:170
-#: actions/twittersettings.php:234
-#: actions/twittersettings.php:253
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "Non se puideron gardar os teus axustes de Twitter!"
 
-#: actions/twittersettings.php:174
-#: actions/twittersettings.php:261
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Configuracións de Twitter gardadas."
 
-#: actions/twittersettings.php:192
-#: actions/twittersettings.php:272
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Esa non é a túa conta de Twitter."
 
-#: actions/twittersettings.php:200
-#: actions/twittersettings.php:208
-#: actions/twittersettings.php:280
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "Non se puido eliminar o usuario."
 
-#: actions/twittersettings.php:212
-#: actions/twittersettings.php:284
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Conta de Twitter "
 
-#: actions/twittersettings.php:225
-#: actions/twittersettings.php:239
-#: actions/twittersettings.php:299
-#: actions/twittersettings.php:310
-#: actions/twittersettings.php:322
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:428 actions/twittersettings.php:439
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "Non se puideron gardar as preferenzas de Twitter."
 
-#: actions/twittersettings.php:245
-#: actions/twittersettings.php:330
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Preferencias de Twitter gardadas."
 
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
 msgstr "Comproba estes datos para asegurarte"
 
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
 msgstr "A suscrición foi autorizada, pero non"
 
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr "A suscrición foi rexeitada, pero non"
 
-#: classes/Channel.php:113
-#: classes/Channel.php:129
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Resultados do comando"
 
-#: classes/Channel.php:148
-#: classes/Channel.php:175
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Comando completo"
 
-#: classes/Channel.php:158
-#: classes/Channel.php:185
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Comando fallido"
 
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Desculpa, este comando todavía non está implementado."
 
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
 msgstr "Subscricións: %1$s.\n"
 
-#: classes/Command.php:125
-#: classes/Command.php:242
-#: classes/Command.php:247
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "O usuario non ten último chio."
 
-#: classes/Command.php:146
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Chío marcado coma favorito."
 
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Ubicación: %s"
 
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Páxina persoal: %s"
 
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
-#: classes/Command.php:200
-#: classes/Command.php:202
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
 
-#: classes/Command.php:214
-#: classes/Command.php:219
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Mensaxe directo a %s enviado"
 
-#: classes/Command.php:216
-#: classes/Command.php:221
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Erro ó enviar a mensaxe directa."
 
-#: classes/Command.php:263
-#: classes/Command.php:268
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especifica o nome do usuario ó que queres suscribirte"
 
-#: classes/Command.php:270
-#: classes/Command.php:275
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Suscrito a %s"
 
-#: classes/Command.php:288
-#: classes/Command.php:293
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
 
-#: classes/Command.php:295
-#: classes/Command.php:300
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Desuscribir de %s"
 
-#: classes/Command.php:310
-#: classes/Command.php:330
-#: classes/Command.php:315
-#: classes/Command.php:335
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Comando non implementado."
 
-#: classes/Command.php:313
-#: classes/Command.php:318
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Notificación desactivada."
 
-#: classes/Command.php:315
-#: classes/Command.php:320
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "No se pode desactivar a notificación."
 
-#: classes/Command.php:333
-#: classes/Command.php:338
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Notificación habilitada."
 
-#: classes/Command.php:335
-#: classes/Command.php:340
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Non se pode activar a notificación."
 
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "Non se pode inserir unha mensaxe."
 
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "Non se puido actualizar a mensaxe coa nova URI."
 
 #: lib/gallery.php:46
-#: lib/gallery.php:55
 msgid "User without matching profile in system."
 msgstr "Usuario sen perfil coincidente no sistema."
 
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -3933,13 +3947,12 @@ msgstr ""
 "Tes novas direccións de posteo en %1$s.\n"
 "\n"
 
-#: lib/mail.php:249
-#: lib/mail.php:265
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "%s enviouche unha nova mensaxe privada"
 
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:512
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -3948,382 +3961,2036 @@ msgstr ""
 "%1$s (%2$s) enviouche unha mensaxe privada:\n"
 "\n"
 
-#: lib/mailbox.php:43
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "Só o usuario pode ler os seus propios buzóns."
 
-#: lib/openid.php:195
+#: lib/openid.php:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
 msgstr "Este formulario debería enviarse automáticamente él mesmo."
 
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Chíos favoritos de %s"
 
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Usuario"
 
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Band. Entrada"
 
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "As túas mensaxes entrantes"
 
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Band. Saída"
 
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "As túas mensaxes enviadas"
 
-#: lib/settingsaction.php:99
-#: actions/deleteprofile.php:256
-#: lib/settingsaction.php:103
-#: lib/settingsaction.php:105
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
 msgstr "Twitter"
 
-#: lib/settingsaction.php:100
-#: actions/deleteprofile.php:257
-#: lib/settingsaction.php:104
-#: lib/settingsaction.php:106
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr "Opcións de integración de Twitter"
 
-#: lib/util.php:1718
-#: lib/util.php:2204
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "A"
 
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "Non se puido analizaar a mensaxe."
 
-#: actions/block.php:45
-#: actions/subedit.php:45
-#: actions/unblock.php:45
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s e amigos"
+
+#: actions/avatarsettings.php:76
+#, fuzzy
+msgid "You can upload your personal avatar."
+msgstr "Podes actualizar a túa información do perfil persoal aquí"
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Configuracións de Twitter"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr ""
+
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr ""
+
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
+msgid "Crop"
+msgstr ""
+
+#: actions/avatarsettings.php:248 actions/deletenotice.php:133
+#: actions/emailsettings.php:224 actions/grouplogo.php:307
+#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
+#: actions/newnotice.php:96 actions/openidsettings.php:188
+#: actions/othersettings.php:136 actions/passwordsettings.php:131
+#: actions/profilesettings.php:172 actions/register.php:113
+#: actions/remotesubscribe.php:53 actions/smssettings.php:216
+#: actions/subedit.php:38 actions/twittersettings.php:290
+#: actions/userauthorization.php:39
+#, fuzzy
+msgid "There was a problem with your session token. "
+msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
+
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr ""
+
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "Bloqueo de usuario fallido."
+
+#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
+#: actions/grouplogo.php:406 actions/grouplogo.php:440
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
+#, fuzzy
+msgid "Unknown file type"
+msgstr "tipo de ficheiro non soportado"
+
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "Non se especificou ningún perfil."
 
-#: actions/block.php:52
-#: actions/subedit.php:52
-#: actions/tagother.php:45
-#: actions/unblock.php:52
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "Non se atopou un perfil con ese ID."
 
-#: actions/block.php:78
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Bloquear usuario"
 
-#: actions/block.php:81
-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 "Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a ser notificado de ningunha resposta-@ del."
+#: actions/block.php:129
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "Estas seguro que queres eliminar este chío?"
 
-#: actions/block.php:117
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Xa bloqueaches a este usuario."
 
-#: actions/block.php:124
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "Erro ao gardar información de bloqueo."
 
-#: actions/deleteprofile.php:25
-msgid "Code not yet ready."
-msgstr "Código non implementado."
+#: actions/confirmaddress.php:159
+#, fuzzy, php-format
+msgid "The address \"%s\" has been "
+msgstr "Enderezo eliminado."
+
+#: actions/deletenotice.php:73
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr ""
+"Vas a eliminar permanentemente este chío. Unha vez feito, xa non hai volta "
+"atrás... Quedas avisado!"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Engadir a favoritos"
+
+#: actions/editgroup.php:54 actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr ""
 
-#: actions/deleteprofile.php:36
-msgid "Export and delete your user information."
-msgstr "Exportar e eliminar a túa información de usuario."
+#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
+#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
+msgid "Inboxes must be enabled for groups to work"
+msgstr ""
 
-#: actions/deleteprofile.php:88
-#: actions/deleteprofile.php:119
-msgid "Delete my account"
-msgstr "Borrar a miña conta"
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
+#, fuzzy
+msgid "You must be logged in to create a group."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
-#: actions/deleteprofile.php:89
-msgid "Delete my account confirmation"
-msgstr "Confirmación de borrado da miña conta"
+#: actions/editgroup.php:87 actions/grouplogo.php:87
+#: actions/groupmembers.php:76 actions/joingroup.php:81
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
+#, fuzzy
+msgid "No nickname"
+msgstr "Sen alcume."
 
-#: actions/deleteprofile.php:117
-msgid "Check if you are sure you want to delete your account."
-msgstr "Estas seguro que queres eliminar a tua conta?"
+#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
+#: actions/groupmembers.php:83 actions/joingroup.php:88
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "Non é o usuario"
 
-#: actions/deleteprofile.php:259
-#: lib/settingsaction.php:106
-#: lib/util.php:384
-#: lib/settingsaction.php:108
-msgid "Other"
-msgstr "Outros"
+#: actions/editgroup.php:106 actions/editgroup.php:165
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
+#, fuzzy
+msgid "You must be an admin to edit the group"
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
-#: actions/deleteprofile.php:260
-#: lib/settingsaction.php:107
-#: lib/settingsaction.php:109
-msgid "Other options"
-msgstr "Outras opcions"
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Add to favorites"
-msgstr "Engadir a favoritos"
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
+msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos."
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "O teu Bio é demasiado longo (max 140 car.)."
+
+#: actions/editgroup.php:218 actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+msgstr "Non se puido actualizar o usuario."
+
+#: actions/editgroup.php:226 actions/editgroup.php:269
+#, fuzzy
+msgid "Options saved."
+msgstr "Configuracións gardadas."
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "Agardando a confirmación neste número de teléfono."
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "Nova dirección de email para posterar en %s"
 
-#: actions/emailsettings.php:98
+#: actions/emailsettings.php:157
+#, fuzzy
+msgid "Send me email when someone "
+msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir aos amigos darme toques e enviarme correos electrónicos."
 
-#: actions/facebookremove.php:54
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "Este enderezo de correo xa pertence a outro usuario."
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
+msgstr ""
+"O código de confirmación foi embiado á dirección IM que engadiches. Deberías "
+"engadir a %s como contacto para que che poida enviar mensaxes."
+
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
+msgid "Server error - couldn't get user!"
+msgstr ""
+
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
+msgstr ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
+
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
+msgid "Skip"
+msgstr ""
+
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
+#, fuzzy
+msgid "No notice content!"
+msgstr "Sen contido!"
+
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
+msgid "Pagination"
+msgstr ""
+
+#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
+#, fuzzy
+msgid "After"
+msgstr "« Despois"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
+#, fuzzy
+msgid "Before"
+msgstr "Antes »"
+
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "Invitación(s) enviada(s) á seguinte xente:"
+
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
+#, fuzzy, php-format
+msgid "You have been invited to %s"
+msgstr "%s douche un toque"
+
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "Fonte para os amigos de %s"
+
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
+#, php-format
+msgid "Send invitations"
+msgstr ""
+
+#: actions/facebookremove.php:56
 msgid "Couldn't remove Facebook user."
 msgstr "Non se puido eliminar o usuario de Facebook."
 
-#: actions/favorited.php:31
-#: lib/stream.php:48
-msgid "Popular notices"
-msgstr "Chíos populares"
+#: actions/facebooksettings.php:65
+#, fuzzy
+msgid "There was a problem saving your sync preferences!"
+msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 
-#: actions/favorited.php:54
-msgid "Showing recently popular notices"
-msgstr "Amosando chíos populares recentes"
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "Preferencias gardadas."
+
+#: actions/facebooksettings.php:90
+#, fuzzy
+msgid "Automatically update my Facebook status with my notices."
+msgstr "Enviar automáticamente os meus chíos a Twitter."
+
+#: actions/facebooksettings.php:97
+#, fuzzy
+msgid "Send \"@\" replies to Facebook."
+msgstr "Enviar respostas \"@\" locais a Twitter."
+
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "Perfil"
 
-#: actions/favor.php:71
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "Preferencias"
+
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Desactivar favorito"
 
-#: actions/featured.php:32
-#: actions/featured.php:54
-#: lib/stream.php:44
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
+msgid "Popular notices"
+msgstr "Chíos populares"
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Chíos populares"
+
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "Amoa os tags máis populares dende a semana pasada"
+
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Usuarios destacados"
 
-#: actions/finishremotesubscribe.php:186
+#: actions/featured.php:71
+#, fuzzy, php-format
+msgid "Featured users, page %d"
+msgstr "Usuarios destacados"
+
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Este usuario non che permite suscribirte a el."
 
-#: actions/imsettings.php:83
-msgid "Send me notices from public timeline through Jabber/GTalk."
-msgstr "Enviarme os chíos da liña de tempo pública a través de Jabber/GTalk."
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
+msgid "No ID"
+msgstr ""
+
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar actualizado."
+
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Acounteceu un fallo ó actualizar o avatar."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr ""
+
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr ""
+
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr ""
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
+
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
+msgstr ""
 
-#: actions/login.php:120
-msgid "you can also login using OpenID"
-msgstr "tamén te podes rexistrar cunha conta OpenID"
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Crear nova conta"
 
-#: actions/microsummary.php:39
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr ""
+"Procurar xente en %%site.name%% polo seu nome, localización, ou intereses. "
+
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "Procurar xente."
+
+#: actions/imsettings.php:70
+#, fuzzy
+msgid "You can send and receive notices through "
+msgstr "Non podes enviar mensaxes a este usurio."
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "Enviarme advertencias a través de Jabber/GTalk."
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "Sen código de confirmación."
+
+#: actions/joingroup.php:65 actions/joingroup.php:60
+#, fuzzy
+msgid "You must be logged in to join a group."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Xa estas suscrito a estes usuarios:"
+
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%s / Favoritos dende %s"
+
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
+msgstr ""
+
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "Non existe a etiqueta."
+
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Non estás suscrito a ese perfil"
+
+#: actions/leavegroup.php:100
+#, fuzzy
+msgid "You may not leave a group while you are its administrator."
+msgstr "Non deberías eliminar o estado de outro usuario"
+
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "Non se puido actualizar o rexistro de usuario."
+
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
+msgid "Login to site"
+msgstr ""
+
+#: actions/microsummary.php:69
 msgid "No current status"
 msgstr "Sen estado actual"
 
-#: actions/misc.php:81
-msgid "Embedded"
-msgstr "Embebida"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr ""
+
+#: actions/newgroup.php:115 actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr ""
 
-#: actions/misc.php:82
-#, php-format
-msgid "Embedded %1s"
-msgstr "%1s embebida"
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "Non se puido crear o favorito."
+
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Non se pode gardar a subscrición."
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "Ese arquivo é demasiado grande."
 
-#: actions/misc.php:84
-msgid "WP"
-msgstr "WP"
+#: actions/newmessage.php:134
+#, fuzzy
+msgid "Don't send a message to yourself; "
+msgstr "Non podes enviar mensaxes a este usurio."
 
-#: actions/newnotice.php:93
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "Chío publicado"
 
-#: actions/newnotice.php:116
-#: classes/Channel.php:140
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Erro de Ajax"
 
-#: actions/nudge.php:52
-msgid "This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr "Este usuario non permite toques, ou non confirmou ainda o seu correo electrónico."
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"Este usuario non permite toques, ou non confirmou ainda o seu correo "
+"electrónico."
 
-#: actions/nudge.php:61
+#: actions/nudge.php:94
 msgid "Nudge sent"
 msgstr "Toque enviado"
 
-#: actions/othersettings.php:27
-msgid "Manage various other options."
-msgstr "Xestionár axustes varios."
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Toque enviado!"
+
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
+#, fuzzy
+msgid "OpenID login"
+msgstr "Acceso OpenID"
 
-#: actions/othersettings.php:33
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "Eliminar OpenID"
+
+#: actions/othersettings.php:60
 msgid "Other Settings"
 msgstr "Outros axustes"
 
-#: actions/othersettings.php:35
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Xestionár axustes varios."
+
+#: actions/othersettings.php:93
 msgid "URL Auto-shortening"
 msgstr "Auto-acortado de URL"
 
-#: actions/othersettings.php:54
+#: actions/othersettings.php:112
 msgid "Service"
 msgstr "Servizo"
 
-#: actions/othersettings.php:54
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Servizo de acortado automático a usar."
 
-#: actions/othersettings.php:155
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Sistema de acortamento de URLs demasiado longo (max 50 car.)."
 
-#: actions/peopletag.php:33
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Cambiar contrasinal"
+
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Contrasinal gardada."
+
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr "%s non é unha etiqueta de xente válida"
 
-#: actions/peopletag.php:45
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Usuarios auto-etiquetados como %s - páxina %d"
 
-#: actions/peopletag.php:87
-#, php-format
-msgid "These are users who have tagged themselves \"%s\" to show a common interest, characteristic, hobby or job."
-msgstr "Estes son usuarios que se etiquetaron a sí mesmos como \"%s\" para mostrar intereses comuns, características, aficións ou traballos."
+#: actions/peopletag.php:91
+#, fuzzy, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+"Estes son usuarios que se etiquetaron a sí mesmos como \"%s\" para mostrar "
+"intereses comuns, características, aficións ou traballos."
 
-#: actions/profilesettings.php:92
-msgid "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "Etiquetas para o teu usuario (letras, números, -, ., e _), separados por coma ou espazo"
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
+#, fuzzy
+msgid "Profile information"
+msgstr "Perfil descoñecido"
 
-#: actions/profilesettings.php:116
-msgid "Theme"
-msgstr "Tema"
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"Etiquetas para o teu usuario (letras, números, -, ., e _), separados por "
+"coma ou espazo"
 
-#: actions/profilesettings.php:116
-msgid "Preferred theme"
-msgstr "Tema preferido"
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+msgstr ""
+"Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
+"non humáns)"
 
-#: actions/profilesettings.php:259
-#: actions/tagother.php:131
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Etiqueta inválida: '%s'"
 
-#: actions/profilesettings.php:345
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "Non se puideron gardar as etiquetas."
 
-#: actions/public.php:68
-#, 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 "Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet](http://status.net/). [Únete agora](%%action.register%%) para compartir chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Liña de tempo pública"
 
-#: actions/public.php:90
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Non se pudo recuperar a liña de tempo publica."
 
-#: actions/register.php:67
-#: actions/register.php:177
+#: actions/public.php:220
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Sindicación do Fio Público"
+
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr ""
+
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr ""
+
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Desculpa, só se pode rexistrar a xente con invitación."
 
-#: actions/register.php:156
-#, php-format
-msgid "With this form you can create a new account. You can then post notices and link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%action.openidlogin%%)!)"
-msgstr "Neste formulario podes crear unha conta de usuario. Logo poderás publicar chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
+#: actions/register.php:149
+#, fuzzy
+msgid "You can't register if you don't "
+msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
+
+#: actions/register.php:286
+msgid "With this form you can create "
+msgstr ""
+
+#: actions/register.php:368
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+msgstr ""
+"De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación"
+
+#: actions/register.php:382 actions/register.php:386
+#, fuzzy
+msgid "Used only for updates, announcements, "
+msgstr ""
+"Empregado só para actualizacións, novidades, e recuperación de contrasinais"
 
-#: actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:141
+#: actions/register.php:398
+#, fuzzy
+msgid "URL of your homepage, blog, "
+msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr ""
+" agás esta informción privada: contrasinal, dirección de correo electrónico, "
+"dirección IM, número de teléfono."
+
+#: actions/register.php:471
+#, fuzzy, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr ""
+"Noraboa, %s! E benvido a %%%%site.name%%%%. Dende aquí, igual queres..."
+
+#: actions/register.php:495
+#, fuzzy
+msgid "(You should receive a message by email "
+msgstr "(Deberías recibir unha mensaxe no teu email nun intre, con"
+
+#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
 msgid "That's a local profile! Login to subscribe."
 msgstr "Este é un perfil local! Rexístrate para suscribirte."
 
-#: actions/smspostsettings.php:27
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Replies to %s"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s favorite notices, page %d"
+msgstr "%s chíos favoritos"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79 actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
+#, fuzzy
+msgid "Group profile"
+msgstr "Non existe o perfil."
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
+msgid "URL"
+msgstr ""
+
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
+#, fuzzy
+msgid "Note"
+msgstr "Chíos"
+
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
+#, fuzzy
+msgid "Group actions"
+msgstr "Outras opcions"
+
+#: actions/showgroup.php:323 actions/showgroup.php:304
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
+#, fuzzy
+msgid "Members"
+msgstr "Membro dende"
+
+#: actions/showgroup.php:363 actions/showstream.php:413
+#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
+#, fuzzy
+msgid "(None)"
+msgstr "(nada)"
+
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
 #, php-format
-msgid "You can post on %1s sending an sms to %2s in the followin format: '%3s'"
-msgstr "Podes publicar chíos en %1s enviando un SMS a %2s co seguinte formato: '%3s'"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+
+#: actions/showmessage.php:98
+#, fuzzy
+msgid "Only the sender and recipient "
+msgstr "Só o emisor e destinatario poden ler esta mensaxe."
+
+#: actions/showstream.php:73 actions/showstream.php:78
+#, fuzzy, php-format
+msgid "%s, page %d"
+msgstr "Band. Entrada para %s - páxina %d"
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "Perfil"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
+#, fuzzy
+msgid "User profile"
+msgstr "O usuario non ten perfil."
 
-#: actions/smspostsettings.php:32
-#: actions/smspostsettings.php:33
-#: actions/smspostsettings.php:57
-msgid "SMS Post Settings"
-msgstr "Configuracións de envio por SMS"
+#: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
+#, fuzzy
+msgid "User actions"
+msgstr "Outras opcions"
 
-#: actions/smspostsettings.php:101
-#: actions/smspostsettings.php:106
-msgid "The address was added."
-msgstr "Enderezo engadido."
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
+#, fuzzy
+msgid "Send a direct message to this user"
+msgstr "Non podes enviar mensaxes a este usurio."
 
-#: actions/subedit.php:68
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
+#, fuzzy
+msgid "Message"
+msgstr "Nova mensaxe"
+
+#: actions/showstream.php:451 lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "Subscritores"
+
+#: actions/showstream.php:533 lib/profileaction.php:235
+#, fuzzy
+msgid "All groups"
+msgstr "Tódalas etiquetas"
+
+#: actions/showstream.php:542
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr "Número de teléfono, sen puntuacións ou espazos, co código de área"
+
+#: actions/smssettings.php:162
+#, fuzzy
+msgid "Send me notices through SMS; "
+msgstr "Enviarme advertencias a través de Jabber/GTalk."
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "Agardando a confirmación neste número de teléfono."
+
+#: actions/smssettings.php:453 actions/smssettings.php:465
+#, fuzzy
+msgid "Mobile carrier"
+msgstr "Selecciona unha operadora"
+
+#: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Non estás suscrito a ese perfil"
 
-#: actions/subedit.php:81
+#: actions/subedit.php:83
 msgid "Could not save subscription."
 msgstr "Non se pode gardar a subscrición."
 
-#: actions/subscribe.php:53
+#: actions/subscribe.php:55
 msgid "Not a local user."
 msgstr "Non é usuario local."
 
-#: actions/subscribe.php:67
+#: actions/subscribe.php:69
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#: actions/subscriptions.php:72
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Subscritores"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
+
+#: actions/subscribers.php:63
+#, fuzzy
+msgid "These are the people who listen to "
+msgstr "Esa é a xente que escoita os chíos de %s."
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "Esa é a xente que escoita os chíos de %s."
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Tódalas subscricións"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Tódalas subscricións"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "Esta é a xente á que lle estas a escoitar os chíos %s."
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "Esa é a xente que escoita os chíos de %s."
+
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber."
 
-#: actions/tagother.php:31
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Chíos tagueados con %s"
+
+#: actions/tag.php:66 actions/tag.php:73
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+msgstr ""
+
+#: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Non estás logueado."
 
-#: actions/tagother.php:40
+#: actions/tagother.php:39
 msgid "No id argument."
 msgstr "Non hai argumento id."
 
-#: actions/tagother.php:56
-msgid "Tag a person"
-msgstr "Etiquetar a unha persoa"
+#: actions/tagother.php:65
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Tags"
 
-#: actions/tagother.php:98
-msgid "Tags for this user (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "Etiquetas para este usuario (letras, numeros, -, ., e _), separados por coma ou espazo"
+#: actions/tagother.php:141
+#, fuzzy
+msgid "Tag user"
+msgstr "Tags"
 
-#: actions/tagother.php:120
-msgid "No such profile."
-msgstr "Non existe o perfil."
+#: actions/tagother.php:149 actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+"Etiquetas para este usuario (letras, numeros, -, ., e _), separados por coma "
+"ou espazo"
 
-#: actions/tagother.php:146
-msgid "You can only tag people you are subscribed to or who are subscribed to you."
-msgstr "Só podes etiquetar xente á que estás suscrito ou aos que están suscritos a ti."
+#: actions/tagother.php:164
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 
-#: actions/tagother.php:153
+#: actions/tagother.php:191 actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+"Só podes etiquetar xente á que estás suscrito ou aos que están suscritos a "
+"ti."
+
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Non se poden gardar as etiquetas."
 
-#: actions/tagother.php:188
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr "Usa este formulario para engadir etiquetas aos teus seguidores ou aos que sigues."
-
-#: actions/tag.php:66
-msgid "Showing all tags"
-msgstr "Amosando tódalas etiquetas"
+msgstr ""
+"Usa este formulario para engadir etiquetas aos teus seguidores ou aos que "
+"sigues."
 
-#: actions/tagrss.php:33
+#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Non existe a etiqueta."
 
-#: actions/tagrss.php:62
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "Microblog etiquetado con %s"
 
-#: actions/twitapiblocks.php:45
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Bloqueo de usuario fallido."
 
-#: actions/twitapiblocks.php:66
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "Desbloqueo de usuario fallido."
 
-#: actions/twitapifavorites.php:159
-#: lib/mail.php:294
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Non atopado"
+
+#: actions/twittersettings.php:71
+#, fuzzy
+msgid "Add your Twitter account to automatically send "
+msgstr ""
+"Engade a túa conta de Twitter para enviar automáticamente os teus chíos a "
+"Twitter."
+
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
+msgid "Twitter user name"
+msgstr "Nome de usuario en Twitter"
+
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
+msgid "Twitter password"
+msgstr "Contrasinal de Twitter"
+
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
+msgid "Twitter Friends"
+msgstr "Amigos de Twitter"
+
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
+msgstr ""
+
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "Non se puido recoller información da túa conta  \"%s\" en Twitter."
+
+#: actions/unblock.php:108 actions/groupunblock.php:128
+msgid "Error removing the block."
+msgstr "Acounteceu un erro borrando o bloqueo."
+
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "Non hai identificador de perfil na peticion."
+
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Non se atopou un perfil con ese ID."
+
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "De-suscribido"
+
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/usergroups.php:65 actions/usergroups.php:64
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
+
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
+msgid "Problem saving notice. Unknown user."
+msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
+
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
+"duns minutos."
+
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
+msgstr "Tes restrinxido o envio de chíos neste sitio."
+
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Acounteceu un fallo ó actualizar o avatar."
+
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
+msgid "Other"
+msgstr "Outros"
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
+msgid "Other options"
+msgstr "Outras opcions"
+
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
+#, fuzzy
+msgid "Account"
+msgstr "Sobre"
+
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Cambiar contrasinal"
+
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
+msgid "Connect to IM, SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
+msgid "Logout from the site"
+msgstr ""
+
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
+msgid "Login to the site"
+msgstr ""
+
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
+#, fuzzy
+msgid "Create an account"
+msgstr "Crear nova conta"
+
+#: lib/action.php:341 lib/action.php:418
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "Ningún OpenID."
+
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
+#, fuzzy
+msgid "Help me!"
+msgstr "Axuda"
+
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
+#, fuzzy
+msgid "Site notice"
+msgstr "Novo chío"
+
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
+#, fuzzy
+msgid "Page notice"
+msgstr "Novo chío"
+
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Navegación de subscricións"
+
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
+msgid "StatusNet software license"
+msgstr ""
+
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
+#, fuzzy
+msgid "All "
+msgstr "Todos"
+
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
+#, fuzzy
+msgid "Block this user"
+msgstr "Bloquear usuario"
+
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
+msgid "Block"
+msgstr "Bloquear"
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "%s chíos favoritos"
+
+#: lib/facebookaction.php:268
+#, php-format
+msgid "To use the %s Facebook Application you need to login "
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
+#, fuzzy
+msgid " a new account."
+msgstr "Crear nova conta"
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
+#, fuzzy
+msgid "Published"
+msgstr "Público"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "%s chíos favoritos"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr "Filtrar etiquetas"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "Todos"
+
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
+msgid "Tag"
+msgstr "Etiqueta"
+
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
+msgid "Choose a tag to narrow list"
+msgstr "Elixe unha etiqueta para reducila lista"
+
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
+msgid "Go"
+msgstr "Ir"
+
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
+
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Subscricións"
+
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
+#, fuzzy
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101 lib/groupnav.php:107
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106 lib/groupnav.php:112
+#, fuzzy
+msgid "Logo"
+msgstr "Sair"
+
+#: lib/groupnav.php:107 lib/groupnav.php:113
+#, php-format
+msgid "Add or edit %s logo"
+msgstr ""
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr ""
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr ""
+
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
+msgstr ""
+
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Inicio de sesión"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Gardar"
+
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Accede co teu nome de usuario e contrasinal."
+
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Crear nova conta"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s está a escoitar os teus chíos %2$s."
+
+#: lib/mail.php:254 lib/mail.php:253
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Ubicación: %s"
+
+#: lib/mail.php:256 lib/mail.php:255
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Páxina persoal: %s"
+
+#: lib/mail.php:258 lib/mail.php:257
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461 lib/mail.php:462
+#, php-format
+msgid "You've been nudged by %s"
+msgstr "%s douche un toque"
+
+#: lib/mail.php:465
+#, fuzzy, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+"%1$s (%2$s) enviouche unha mensaxe privada:\n"
+"\n"
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr ""
+"A %1$s gustoulle o teu chío %2$s e marcouno como favorito.\n"
+"\n"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
+#, fuzzy
+msgid "From"
+msgstr " dende "
+
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Eliminar chío"
+
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
+#, fuzzy
+msgid "Send a notice"
+msgstr "Dar un toque"
+
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
+#, fuzzy
+msgid "Available characters"
+msgstr "6 ou máis caracteres"
+
+#: lib/noticelist.php:426 lib/noticelist.php:429
+#, fuzzy
+msgid "in reply to"
+msgstr "en contestación a..."
+
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Non se pode eliminar este chíos."
+
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
+#, fuzzy
+msgid "Reply"
+msgstr "contestar"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Eliminar chío"
+
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete"
+msgstr "eliminar"
+
+#: lib/nudgeform.php:116
+#, fuzzy
+msgid "Nudge this user"
+msgstr "Toque enviado"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Nudge"
+msgstr "Toque enviado"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Non podes enviar mensaxes a este usurio."
+
+#: lib/personaltagcloudsection.php:56
+#, fuzzy, php-format
+msgid "Tags in %s's notices"
+msgstr "O usuario non ten último chio."
+
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(nada)"
+
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Público"
+
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
+#, fuzzy
+msgid "User groups"
+msgstr "Usuarios"
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+msgid "Recent tags"
+msgstr "Etiquetas recentes"
+
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
+msgid "Featured"
+msgstr "Destacado"
+
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
+msgid "Popular"
+msgstr "Popular"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Chíos"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Atopar xente neste sitio"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Suscrición remota"
+
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Suscrito a %s"
+
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
+#, php-format
+msgid "Groups %s is a member of"
+msgstr ""
+
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
+#, fuzzy, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+"Emprega este formulario para invitar ós teus amigos e colegas a empregar "
+"este servizo."
+
+#: lib/subs.php:53 lib/subs.php:52
+msgid "User has blocked you."
+msgstr "O usuario bloqueoute."
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Suscrito a %s"
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "No"
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr ""
+
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Bloquear usuario"
+
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
+msgid "Unblock"
+msgstr "Desbloquear"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "Desuscribir de %s"
+
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Fonte para os amigos de %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Fonte para os amigos de %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Fonte para os amigos de %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s e amigos"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Podes actualizar a túa información do perfil persoal aquí"
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar actualizado."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+"Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito "
+"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
+"ser notificado de ningunha resposta-@ del."
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Vas a eliminar permanentemente este chío. Unha vez feito, xa non hai volta "
+"atrás... Quedas avisado!"
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Microblogue por %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Procurar xente en %%site.name%% pola seu nome, localización, ou intereses. "
+"Separa os termos por espazos; deben ter 3 caracteres ou máis."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Erro ó enviar a mensaxe directa."
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Buscar \"%s\" na Liña de tempo"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Por razóns de seguranza, por favor re-insire o teu nome de usuario e "
+"contrasinal antes de cambiar as túas preferenzas."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Sindicación do Fio Público"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Sindicación do Fio Público"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Sindicación do Fio Público"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
+
+#: actions/register.php:286 actions/register.php:329
+#, fuzzy, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+"Neste formulario podes crear unha conta de usuario. Logo poderás publicar "
+"chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? "
+"Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" agás esta informción privada: contrasinal, dirección de correo electrónico, "
+"dirección IM, número de teléfono."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Crear"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Non existe o perfil."
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "Non existe o perfil."
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Band. Saída para %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Configuración de perfil"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Enviouseche o código de confirmación ó número de teléfono que engadiches. "
+"Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que "
+"debes seguir."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
@@ -4352,48 +6019,66 @@ msgstr ""
 "Fielmente teu,\n"
 "%5$s\n"
 
-#: actions/twitapiusers.php:46
-msgid "Not found."
-msgstr "Non atopado"
-
-#: actions/twittersettings.php:29
-msgid "Add your Twitter account to automatically send your notices to Twitter, and subscribe to Twitter friends already here."
-msgstr "Engade a túa conta de Twitter para enviar automáticamente os teus chíos a Twitter, e suscribirte aos usuarios de twiter que teñas como amigos aqui."
-
-#: actions/twittersettings.php:63
-msgid "Twitter user name"
-msgstr "Nome de usuario en Twitter"
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Non é o usuario"
 
-#: actions/twittersettings.php:67
-msgid "Twitter password"
-msgstr "Contrasinal de Twitter"
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Engade a túa conta de Twitter para enviar automáticamente os teus chíos a "
+"Twitter, e suscribirte aos usuarios de twiter que teñas como amigos aqui."
 
-#: actions/twittersettings.php:129
-msgid "Twitter Friends"
-msgstr "Amigos de Twitter"
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Non se puido recoller información da túa conta  \"%s\" en Twitter."
 
-#: actions/unblock.php:73
-msgid "Error removing the block."
-msgstr "Acounteceu un erro borrando o bloqueo."
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"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 \"Cancel\"."
 
-#: actions/unsubscribe.php:48
-msgid "No profile id in request."
-msgstr "Non hai identificador de perfil na peticion."
+#: actions/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
 
-#: actions/unsubscribe.php:55
-msgid "No profile with that id."
-msgstr "Non se atopou un perfil con ese ID."
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
+"duns minutos."
 
-#: actions/unsubscribe.php:69
-msgid "Unsubscribed"
-msgstr "De-suscribido"
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
 
-#: actions/users.php:38
-#: lib/util.php:378
-msgid "Users list"
-msgstr "Lista de usuarios"
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
 
-#: classes/Command.php:96
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -4404,7 +6089,7 @@ msgstr ""
 "Suscriptores: %2$s\n"
 "Chíos: %3$s"
 
-#: classes/Command.php:349
+#: lib/command.php:392 lib/command.php:385
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4460,53 +6145,41 @@ msgstr ""
 "tracks - non implementado por agora.\n"
 "tracking - non implementado por agora.\n"
 
-#: classes/Notice.php:100
-msgid "Problem saving notice. Unknown user."
-msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
-
-#: classes/Notice.php:105
-msgid "Too many notices too fast; take a breather and post again in a few minutes."
-msgstr "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro duns minutos."
-
-#: classes/Notice.php:112
-msgid "You are banned from posting notices on this site."
-msgstr "Tes restrinxido o envio de chíos neste sitio."
-
-#: lib/gallery.php:98
-msgid "Filter tags"
-msgstr "Filtrar etiquetas"
-
-#: lib/gallery.php:104
-msgid "All"
-msgstr "Todos"
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
 
-#: lib/gallery.php:108
-msgid "Tag"
-msgstr "Etiqueta"
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"Se xa tes unha conta, accede co teu usuario e contrasinal para conectar co "
+"teu OpenID."
 
-#: lib/gallery.php:109
-msgid "Choose a tag to narrow list"
-msgstr "Elixe unha etiqueta para reducila lista"
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
 
-#: lib/gallery.php:110
-msgid "Go"
-msgstr "Ir"
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
 
-#: lib/gallery.php:264
-msgid "Subscriptions navigation"
-msgstr "Navegación de subscricións"
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
 
-#: lib/gallery.php:270
-#: lib/gallery.php:292
-msgid "List"
-msgstr "Lista"
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
 
-#: lib/gallery.php:280
-#: lib/gallery.php:294
-msgid "Icons"
-msgstr "Iconos"
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
 
-#: lib/mail.php:92
+#: lib/mail.php:175 lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
@@ -4535,15 +6208,32 @@ msgstr ""
 "Grazas polo teu tempo, \n"
 "%s\n"
 
-#: lib/mail.php:232
-#, php-format
-msgid "You've been nudged by %s"
-msgstr "%s douche un toque"
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s está a escoitar os teus chíos en %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Atentamente todo seu,\n"
+"%4$s.\n"
 
-#: lib/mail.php:236
+#: lib/mail.php:466
 #, 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"
+"%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"
@@ -4565,7 +6255,7 @@ msgstr ""
 "With kind regards,\n"
 "%4$s\n"
 
-#: lib/mail.php:269
+#: lib/mail.php:513
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -4598,116 +6288,1638 @@ msgstr ""
 "With kind regards,\n"
 "%5$s\n"
 
-#: lib/profilelist.php:146
-msgid "(none)"
-msgstr "(nada)"
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
 
-#: lib/settingsaction.php:97
-#: lib/settingsaction.php:98
-msgid "SMS Post"
-msgstr "Envío por SMS"
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Buscar"
 
-#: lib/settingsaction.php:98
-#: lib/settingsaction.php:99
-msgid "Posts by SMS"
-msgstr "Chíos dende SMS"
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
 
-#: lib/stream.php:33
-msgid "Public"
-msgstr "Público"
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
 
-#: lib/stream.php:36
-#: lib/stream.php:37
-msgid "Recent tags"
-msgstr "Etiquetas recentes"
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
 
-#: lib/stream.php:39
-#: lib/stream.php:40
-msgid "All tags"
-msgstr "Tódalas etiquetas"
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: lib/stream.php:43
-msgid "Featured"
-msgstr "Destacado"
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
 
-#: lib/stream.php:47
-msgid "Popular"
-msgstr "Popular"
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Ningún documento."
 
-#: lib/subs.php:51
-msgid "User has blocked you."
+#: actions/block.php:149
+msgid "Do not block this user from this group"
+msgstr ""
+
+#: actions/block.php:150
+msgid "Block this user from this group"
+msgstr ""
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr ""
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr ""
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Desbloqueo de usuario fallido."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Código de confirmación."
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Non se pode eliminar este chíos."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Etiqueta inválida: '%s'"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Non se puido crear o favorito."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Novo chío"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Novo chío"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Non é un alcume válido."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Non se especificou ningún perfil."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
 msgstr "O usuario bloqueoute."
 
-#: lib/util.php:379
-msgid "Users"
-msgstr "Usuarios"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "%1s non é unha orixe fiable."
 
-#: lib/util.php:2118
-msgid "Send a nudge"
-msgstr "Dar un toque"
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Bloquear usuario"
 
-#: lib/util.php:2122
-msgid "Nudge sent!"
-msgstr "Toque enviado!"
+#: actions/groupblock.php:155
+#, fuzzy, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+"Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito "
+"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
+"ser notificado de ningunha resposta-@ del."
 
-#: lib/util.php:2253
-msgid "Block"
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Non se puido actualizar o usuario."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Non se puideron gardar os teus axustes de Twitter!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Preferencias gardadas."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Non se atoparon resultados"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "O usuario bloqueoute."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Non hai mensaxes de texto!"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Non se puido gardar o perfil."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) permiteche acceder en moitos sitios coa mesma "
+"conta. Xestina os teus OpenIDs asociados dende aquí."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Configuración de perfil"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Se esquenceches ou perdeches a túa contrasinal, podes obter unha nova no "
+"enderezo de correo que configuraches na túa conta."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Foiches identificado. Insire unha nova contrasinal abaixo."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Petición de recuperación de contrasinal"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Acounteceu un erro co código de confirmación."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Suscrito a %s"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Chíos favoritos de %s"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Non é usuario local."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Chíos tagueados con %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s está a escoitar os teus chíos %2$s."
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Este chío xa é un favorito!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Este chío non é un favorito!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Non se pudo recuperar a liña de tempo publica."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "Non se especificou ningún destinatario"
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Non se puido atopar ningún estado"
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Chíos que respostan a %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Actualizacións dende %1$s en %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Subscrición de autorización."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Configuración de perfil"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "%1s non é unha orixe fiable."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Aconteceu un erro ó gardar o chío."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Mensaxe de %1$s en %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "O usuario non ten perfil."
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Perfil"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Subir"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Cambiar contrasinal"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Conectar"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Buscar"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Lista"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
 msgstr "Bloquear"
 
-#: lib/util.php:2257
-msgid "Unblock"
-msgstr "Desbloquear"
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Bloquear usuario"
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
 
-#: actions/newsmsnotice.php:29
-#: actions/smspostsettings.php:57
-msgid "SMS Post Disabled!"
-msgstr "Publicación de chíos por SMS desactivado!"
+#: lib/mail.php:556
+#, fuzzy, php-format
+msgid ""
+"%1$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 ""
+"%1$s acaba de engadir o teu chío en %2$s como un dos seus favoritos.\n"
+"\n"
+"Se o olvidaches, podes velo texto do teu chío aquí:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Podes vela lista de cíos favoritos de %1$s aquí:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Fielmente teu,\n"
+"%5$s\n"
 
-#: actions/badgemisc.php:31
+#: lib/mail.php:646
 #, php-format
-msgid "%1s in your blog"
-msgstr "%1s no teu blogue"
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
 
-#: actions/misc.php:85
-msgid "WordPress Plugin"
-msgstr "Plugin WordPress"
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
 
-#: actions/misc.php:88
+#: lib/mail.php:682
 #, php-format
-msgid "Graphics and statistics about the state of %1s"
-msgstr "Gráficos e estatísticas sobre o estado de %1s"
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
 
-#: actions/newsmsnotice.php:35
+#: lib/mail.php:685
 #, php-format
-msgid "%1s is not a reliable source."
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Sen contido!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Usuario"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Buscar"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
 msgstr "%1s non é unha orixe fiable."
 
-#: actions/newsmsnotice.php:60
-msgid "Unexpected error"
-msgstr "Erro inesperado"
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
 
-#: actions/newsmsnotice.php:65
-msgid "No such phone"
-msgstr "Non existe o telefono"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Non existe a etiqueta."
 
-#: actions/newsmsnotice.php:75
-msgid "Missing message"
-msgstr "Falta a mensaxe"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Mensaxes directas para %s"
 
-#: actions/newsmsnotice.php:91
-msgid "Notice published correctly"
-msgstr "Chío publicado correctamente"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+"Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres."
 
-#: actions/wpmisc.php:27
-msgid "If you want to have your notices on your Wordpress, then follow the instructions"
-msgstr "Se queres ter os teus chios no teu Wordpress, sigue as instruccións"
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "O teu Bio é demasiado longo (max 140 car.)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Xa estas suscrito a estes usuarios:"
 
-#: actions/wpmisc.php:31
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Non estás suscrito a ese perfil"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Usuarios"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%1s non é unha orixe fiable."
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Outras opcions"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar actualizado."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+"Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
 #, php-format
-msgid "%1s on your Wordpress"
-msgstr "%1s no teu Wordpress"
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Formato de ficheiro de imaxe non soportado."
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "O teu Bio é demasiado longo (max 140 car.)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Actualizacións dende %1$s en %2$s!"
 
-#: actions/badgemisc.php:27
-msgid "If you want to have your notices on your blog/website, then follow the instructions"
-msgstr "Se queres ter os teus chios no teu blogue/sitio web, sigue as instruccións"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "O usuario  que está sendo escoitado non existe."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Non está autorizado."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Non se pode convertir o token da petición a tokens de acceso."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Versión de protocolo OMB descoñecida."
 
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Ningún chío."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Bloqueo de usuario fallido."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Actualizacións dende %1$s en %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Accede co teu nome de usuario e contrasinal. ¿Non tes un todavía?? [Rexistra]"
+"(%%action.register%%) unha nova conta, ou accede co teu enderezo [OpenID](%%"
+"action.openidlogin%%). "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Actualizacións dende %1$s en %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Tódalas actualizacións que coinciden co termo de procura \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Conectar"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "O teu Bio é demasiado longo (max 140 car.)."
+
+#: actions/register.php:336
+#, fuzzy
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+"Neste formulario podes crear unha conta de usuario. Logo poderás publicar "
+"chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? "
+"Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Non é un enderezo de perfil válido (non ten documento YADIS)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Este é un perfil local! Rexístrate para suscribirte."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Non se puido recoller o token de petición."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Mensaxe de %1$s en %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Fonte para os amigos de %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Fonte para os amigos de %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Fonte para os amigos de %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Band. Saída para %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Chío publicado"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"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 \"Cancel\"."
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"A subscrición foi autorizada, pero ningunha URL de retorno foi "
+"proporcionada. Comproba coas instruccións do sitio para máis detalles en "
+"como autorizar subscricións. O teu token de subscrición é:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"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."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Non se pode ler a URL do avatar de '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Tipo de imaxe incorrecto para '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Non se pode redireccionar ao servidor: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Atopar no contido dos chíos"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Toque enviado"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Non se pode eliminar este chíos."
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Aconteceu un erro ó gardar o chío."
+
+#: lib/command.php:587
+#, fuzzy
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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 ""
+"Comandos:\n"
+"on - activar as notificacións\n"
+"off - desactivar as notificacións\n"
+"help - mostrar esta axuda\n"
+"follow <nickname> - suscribirse ao usuario\n"
+"leave <nickname> - de-suscribirse do usuario\n"
+"d <nickname> <text> - mensaxe directa ao usuario\n"
+"get <nickname> - lelo último chío do usuario\n"
+"whois <nickname> - amosar informacion do usuario\n"
+"fav <nickname> - engadilo último chío do usuario como favorito\n"
+"stats - amosalas túas estatísticas\n"
+"stop - o mesmo que 'off'\n"
+"quit - o mesmo que 'off'\n"
+"sub <nickname> - o mesmo que 'follow'\n"
+"unsub <nickname> - o mesmo que 'leave'\n"
+"last <nickname> - o mesmo que 'get'\n"
+"on <nickname> - non implementado por agora.\n"
+"off <nickname> - non implementado por agora.\n"
+"nudge <nickname> - non implementado por agora.\n"
+"invite <phone number> - non implementado por agora.\n"
+"track <word> - non implementado por agora.\n"
+"untrack <word> - non implementado por agora.\n"
+"track off - non implementado por agora.\n"
+"untrack all - non implementado por agora.\n"
+"tracks - non implementado por agora.\n"
+"tracking - non implementado por agora.\n"
+
+#: lib/common.php:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Sen código de confirmación."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Selecciona unha operadora"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Novo chío"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s gustoulle o teu chío"
+
+#: lib/mail.php:556
+#, fuzzy, 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 ""
+"%1$s acaba de engadir o teu chío en %2$s como un dos seus favoritos.\n"
+"\n"
+"Se o olvidaches, podes velo texto do teu chío aquí:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Podes vela lista de cíos favoritos de %1$s aquí:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Fielmente teu,\n"
+"%5$s\n"
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " dende "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Non se pudo recuperar a liña de tempo publica."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Eliminar chío"
diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
index 609918d92..082968542 100644
--- a/locale/he/LC_MESSAGES/statusnet.mo
+++ b/locale/he/LC_MESSAGES/statusnet.mo
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 97a44a030..12251a909 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -1,40 +1,29 @@
-# #-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#
-# Hebrew translation for StatusNet
-# תרגו� לעברית של ל�קוניה
-# Copyright (C) 2008 COPYRIGHT HOLDER
-# כל הזכויות שמורות, 2008
-# This file is distributed under the same license as the StatusNet package.
-# קובץ זה מופץ תחת רשיון זהה לזה של החבילה ל�קוניקה
-# Hezy Amiel חזי עמי�ל <open@hezyamiel.com>, 2008.
-#
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Hebrew
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-01-30 12:07+0000\n"
-"Last-Translator: support team <jbrnra@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:45+0000\n"
+"Language-Team: Hebrew\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: he\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "חיפוש ברצף �חרי \"%s\""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -45,17 +34,19 @@ msgid " from "
 msgstr ""
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -87,6 +78,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
@@ -108,25 +100,28 @@ msgstr ""
 " %4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "הסטטוס של %1$s ב-%2$s "
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "רצף ציבורי ב-%s"
@@ -136,40 +131,55 @@ msgstr "רצף ציבורי ב-%s"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s וחברי�"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -178,7 +188,8 @@ msgstr ""
 "**%%site.name%%** הו� שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
 "site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** הו� שרות ביקרובלוג."
@@ -190,30 +201,34 @@ msgstr "תנו קרדיט מל×� לכותבי×� בשמ×� המל×� ×�ו בכינ×
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 עד 64 �ותיות �נגליות קטנות �ו מספרי�, לל� סימני פיסוק �ו רווחי�."
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "לפחות 6 �ותיות"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "לפחות 6 �ותיות, �ל תשכח!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr " לפחות 6 �ותיות. שדה חובה."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -223,6 +238,7 @@ msgstr ""
 "מידיי� �ליך."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -252,7 +268,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
@@ -275,16 +318,23 @@ msgstr ""
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "�ודות"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "קבל"
 
@@ -295,6 +345,9 @@ msgstr "קבל"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "הוסף"
 
@@ -312,27 +365,29 @@ msgstr ""
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "כתבות"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "כל המנויי�"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "כל העדכוני� עבור %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "כל העידכוני� התו�מי� �ת החיפוש �חרי \"%s\""
@@ -342,30 +397,37 @@ msgstr "כל העידכוני� התו�מי� �ת החיפוש �חרי \"%s\"
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "כבר מחובר."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "כבר מנוי!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "�שר מנוי"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "בעתיד התחבר �וטומטית; ל� לשימוש במחשבי� ציבוריי�!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -373,15 +435,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "תמונה"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "התמונה עודכנה."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -391,13 +457,14 @@ msgstr ""
 "נוספותץ (ה�� הוספת �ת %s לרשימת החברי� שלך?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
@@ -409,6 +476,8 @@ msgstr "לפני >>"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "ביוגרפיה"
 
@@ -416,16 +485,18 @@ msgstr "ביוגרפיה"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "הביוגרפיה �רוכה מידי (לכל היותר 140 �ותיות)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr ""
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "ל� ניתן לקרו� �ת ה-URL '%s' של התמונה"
@@ -433,6 +504,8 @@ msgstr "ל� ניתן לקרו� �ת ה-URL '%s' של התמונה"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "ל� ניתן לשמור �ת הסיסמה"
 
@@ -440,31 +513,34 @@ msgstr "ל� ניתן לשמור �ת הסיסמה"
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "בטל"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "ל� ניתן להפעיל �ת �ובייקט הלקוח של OpenID."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "ל� ניתן לנרמל �ת זהות ה-Jabber הזה"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "שנה"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr ""
 
@@ -474,11 +550,12 @@ msgid "Change password"
 msgstr "שנה סיסמה"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr ""
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr ""
 
@@ -488,6 +565,9 @@ msgstr ""
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "�שר"
 
@@ -500,12 +580,14 @@ msgstr "�שר כתובת"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "ה�ישור בוטל."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr ""
 
@@ -514,7 +596,8 @@ msgstr ""
 msgid "Confirmation code not found."
 msgstr "קוד ה�ישור ל� נמצ�."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -534,20 +617,24 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "התחבר"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "התחבר לחשבון קיי�"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "צור קשר"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "נכשלה יצירת OpenID מתוך: %s"
@@ -555,35 +642,39 @@ msgstr "נכשלה יצירת OpenID מתוך: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr ""
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "נכשלה ההפניה לשרת: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "שמירת מידע התמונה נכשל"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "שמירת מידע הפרופיל החדש נכשלה"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr ""
 
@@ -603,15 +694,17 @@ msgstr "המרת �סימון הבקשה ל�סימון גישה ל� הצליח
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "מחיקת המנוי ל� הצליחה."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr ""
 
@@ -624,29 +717,38 @@ msgstr "�סימון הבקשה ל� התקבל."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "הכנסת קוד ה�ישור נכשלה."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "הכנסת מנוי חדש נכשלה."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "שמירת הפרופיל נכשלה."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -662,42 +764,48 @@ msgstr ""
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "עידכון המשתמש נכשל."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "צור"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "צור משתמש חדש ע� הכינוי הזה."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "צור חשבון חדש"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "יצירת חשבון חדש עבור OpenID שכבר משוייך למשתמש."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "כתובת מ�ושרת נוכחית של Jabber/GTalk."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -706,23 +814,27 @@ msgid "Currently"
 msgstr "כרגע"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "שגי�ת מסד נתוני� בהכנסת התגובה: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr ""
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
 
@@ -730,11 +842,13 @@ msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ות
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr ""
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr ""
 
@@ -744,39 +858,43 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr ""
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr ""
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr ""
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr ""
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "שגי�ה ב�ישור ה�סימון"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "שגי�ה בקישור המשתמש ל-OpenID."
 
@@ -787,39 +905,46 @@ msgstr "שגי�ת חיבור משתמש."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "שגי�ה בהכנסת התמונה."
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "שגי�ה בהכנסת הפרופיל"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "שגי�ה בהכנסת פרופיל מרוחק"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "שגי�ה בשמירת �ישור הכתובת."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "שגי�ה בשמירת פרופיל מרוחק"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "שגי�ה בשמירת הפרופיל."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "שגי�ה בשמירת המשתמש."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "שגי�ה בשמירת ש� המשתמש, ל� עומד בכללי�."
 
@@ -828,6 +953,9 @@ msgstr "שגי�ה בשמירת ש� המשתמש, ל� עומד בכללי�."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "שגי�ה ביצירת ש� המשתמש."
 
@@ -838,6 +966,7 @@ msgstr "שגי�ה בעידכון הפרופיל"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "שגי�ה בעדכון פרופיל מרוחק"
 
@@ -847,33 +976,36 @@ msgid "Error with confirmation code."
 msgstr "שגי�ה ב�ישור הקוד."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "כינוי זה כבר קיי�"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "רשימת ש�לות נפוצות"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "עדכון התמונה נכשל."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "הזנות החברי� של %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "הזנת התגובות ל-%s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
@@ -888,7 +1020,7 @@ msgstr ""
 msgid "Find people on this site"
 msgstr ""
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -899,6 +1031,11 @@ msgstr "לצרכי �בטחה, הכנס מחדש �ת ש� המשתמש והסי
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "ש� מל�"
 
@@ -907,23 +1044,33 @@ msgstr "ש� מל�"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "הש� המל� �רוך מידי (מותרות 255 �ותיות בלבד)"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "עזרה"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "בית"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "�תר בית"
 
@@ -931,21 +1078,27 @@ msgstr "�תר בית"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "ל�תר הבית יש כתובת ל� חוקית."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr ""
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr ""
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "כתובת מסרי� מידיי�"
 
@@ -955,21 +1108,21 @@ msgid "IM Settings"
 msgstr "הגדרות מסרי� מידיי�"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
 "�� יש לך כבר חשבון, התחבר ע� ש� המשתמש והסיסמה שלך וקשר �ותו �ל ה-OpenID שלך."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
 "�� �תה רוצה להוסיף OpenID לחשבון שלך, הכנס �ותו לתיבה שלמטה ולחץ \"הוסף\""
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -978,55 +1131,62 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "הסיסמה הישנה ל� נכונה"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "ש� משתמש �ו סיסמה ל� נכוני�."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "כתובת התמונה '%s' �ינה חוקית"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "כתובת �תר הבית '%s' �ינה חוקית"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "כתובת הרשיון '%s' �יה חוקית"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "תוכן ההודעה ל� חוקי"
 
@@ -1041,13 +1201,13 @@ msgid "Invalid notice url"
 msgstr "כתובת ל� חוקית"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "כתובת הפרופיל '%s' ל� חוקית."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "כתובת פרופיל ל� חוקית (פורמט ל� תקין)"
 
@@ -1065,28 +1225,35 @@ msgstr "גודל ל� חוקי."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "ש� המשתמש �ו הסיסמה ל� חוקיי�"
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr ""
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1098,11 +1265,12 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)"
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "זיהוי ה-Jabber כבר שייך למשתמש �חר."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1112,12 +1280,14 @@ msgstr ""
 "החברי� בתוכנת ההמסרי� המידיי� �ו GTalk שלך."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "שפה"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
@@ -1126,7 +1296,15 @@ msgstr ""
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "מיקו�"
 
@@ -1135,7 +1313,12 @@ msgstr "מיקו�"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "ש� המיקו� �רוך מידי (מותר עד 255 �ותיות)."
 
@@ -1144,18 +1327,22 @@ msgstr "ש� המיקו� �רוך מידי (מותר עד 255 �ותיות)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "היכנס"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "התחבר לחשבון [OpenID](%%doc.openid%%). "
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1165,22 +1352,26 @@ msgstr ""
 "היכנס בעזרת ש� המשתמש והסיסמה שלך. עדיין �ין לך ש� משתמש? [הרש�](%%action."
 "register%%) לחשבון "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "צ�"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "שכחת �ו �יבדת �ת הסיסמה?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -1191,16 +1382,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "חבר מ�ז"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "מיקרובלוג מ�ת %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1210,42 +1403,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "הטקסטי� והקבצי� שלי מופצי� תחת רשיון"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "חדש"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "כינוי חדש"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "הודעה חדשה"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "סיסמה חדשה"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "הסיסמה החדשה נשמרה בהצלחה. �תה מחובר למערכת."
 
@@ -1255,7 +1456,13 @@ msgstr "הסיסמה החדשה נשמרה בהצלחה. ×�תה מחובר למ×
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "כינוי"
 
@@ -1264,7 +1471,12 @@ msgstr "כינוי"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "כינוי זה כבר תפוס. נסה כינוי �חר."
 
@@ -1273,47 +1485,58 @@ msgstr "כינוי זה כבר תפוס. נסה כינוי �חר."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "כינוי יכול להכיל רק �ותיות �נגליות קטנות ומספרי�, ולל� רווחי�."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "כינוי זה �סור."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "כינויו של המשתמש �חריו �תה רוצה לעקוב"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr ""
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "ל�"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "�ין זיהוי Jabber כזה."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "ל� התבקש �ישור!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr ""
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr ""
 
@@ -1325,11 +1548,15 @@ msgstr "�ין קוד �ישור."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "�ין תוכן!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr ""
 
@@ -1338,7 +1565,9 @@ msgid "No id."
 msgstr "�ין זיהוי."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr ""
 
@@ -1349,6 +1578,7 @@ msgstr "השרת הרחוק ל� מספק כינוי"
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "�ין כינוי"
 
@@ -1356,12 +1586,14 @@ msgstr "�ין כינוי"
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "�ין �ישור ממתין שניתן לבטל."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr ""
 
@@ -1371,7 +1603,8 @@ msgid "No profile URL returned by server."
 msgstr "השרת ל� החזיר כתובת פרופיל"
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr ""
 
@@ -1383,7 +1616,7 @@ msgstr "ל� נמצ�ה בקשה!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "�ין תוצ�ות"
 
@@ -1394,12 +1627,16 @@ msgstr "�ין גודל."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1409,13 +1646,15 @@ msgid "No such OpenID."
 msgstr "�ין OpenID כזה."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "�ין מסמך כזה."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "�ין הודעה כזו."
 
@@ -1453,12 +1692,22 @@ msgstr "�ין מנוי כזה"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "�ין משתמש כזה."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr ""
 
@@ -1472,32 +1721,38 @@ msgid "Not a recovery code."
 msgstr "זהו ל� קוד �ישור."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr ""
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "ל� עומד בכללי� לזיהוי Jabber"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "ל� עומד בכללי� ל-OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr ""
 
@@ -1505,6 +1760,11 @@ msgstr ""
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "ש� משתמש ל� חוקי."
 
@@ -1524,7 +1784,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Not a valid profile URL (no YADIS document)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "זהו ל� קובץ תמונה, �ו שחל בו שיבוש."
 
@@ -1535,11 +1796,13 @@ msgstr "ל� מורשה."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "זו תגובה ל� צפויה!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "ל� נמצ�"
 
@@ -1555,11 +1818,15 @@ msgstr "ל� נמצ�"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "ל� מחובר."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "ל� מנוי!"
 
@@ -1576,39 +1843,44 @@ msgid "Notice feed for %s"
 msgstr "הזנת הודעות של %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "להודעה �ין פרופיל"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "הודעות"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "סיסמה ישנה"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "הגדרת חשבון OpenID"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "הגשה �וטומטית של OpenID"
 
@@ -1616,29 +1888,34 @@ msgstr "הגשה �וטומטית של OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "כניסת OpenId"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "כתובת ה-OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "�ישור ה-OpenID בוטל."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "�ישור ה-OpenID נכשל: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "כשל OpenID: %s"
@@ -1654,11 +1931,12 @@ msgid "OpenID settings"
 msgstr "הגדרות OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "העל�ה חלקית."
 
@@ -1668,34 +1946,46 @@ msgstr "העל�ה חלקית."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "סיסמה"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "הסיסמה ו�ישורה �ינן תו�מות."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "הסיסמה חייבת להיות בת לפחות 6 �ותיות."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "התבקש שיחזור סיסמה"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "הסיסמה נשמרה."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "הסיסמ�ות ל� תו�מות."
 
@@ -1715,14 +2005,17 @@ msgid "People search"
 msgstr "חיפוש סיסמה"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "�ישי"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr ""
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
@@ -1736,7 +2029,7 @@ msgstr ""
 "להירש�, לחץ \"בטל\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "פרס� הודעה כששורת הסטטוס שלי ב-Jabber/GTalk מתעדכנת."
 
@@ -1745,7 +2038,9 @@ msgstr "פרס×� הודעה כששורת הסטטוס שלי ב-Jabber/GTalk מ×
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -1754,42 +2049,52 @@ msgstr "העדפות"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "העדפות נשמרו."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "פרטיות"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "בעיה בשמירת ההודעה."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "פרופיל"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "כתובת הפרופיל"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "הגדרות הפרופיל"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "פרופיל ל� מוכר"
 
@@ -1798,17 +2103,19 @@ msgid "Public Stream Feed"
 msgstr "הזנת זר� הציבורי"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "קו זמן ציבורי"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1818,12 +2125,14 @@ msgid "Recent Tags"
 msgstr ""
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "שיחזור"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "סיסמת שיחזור"
 
@@ -1836,37 +2145,45 @@ msgstr "קוד שיחזור למשתמש ל� ידוע."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "הירש�"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr ""
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "דחה"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "זכור �ותי"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "�ין פרופיל תו�� לפרופיל המרוחק "
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "הרשמה מרוחקת"
 
@@ -1880,6 +2197,9 @@ msgstr "הרשמה מרוחקת"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "הסר"
 
@@ -1888,7 +2208,7 @@ msgstr "הסר"
 msgid "Remove OpenID"
 msgstr "הסר OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1897,34 +2217,41 @@ msgstr ""
 "�ותו, לפני כן הוסף OpenID �חר."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "תגובות"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "תגובת עבור %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "�יפוס"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "�יפוס סיסמה"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "סמס"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr ""
 
@@ -1933,17 +2260,18 @@ msgstr ""
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "זהה לסיסמה למעלה"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -1956,12 +2284,21 @@ msgstr ""
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "שמור"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "חיפוש"
 
@@ -1971,7 +2308,7 @@ msgid "Search Stream Feed"
 msgstr "הזנת זר� החיפושי�"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1980,7 +2317,7 @@ msgstr ""
 "חפש הודעות ב-%%site.name%% לפי תוכנן. הפרד בעזרת רווחי� בין הביטויי�; עליה� "
 "להיות בני לפחות 3 �ותיות."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -1990,48 +2327,56 @@ msgstr ""
 "בין הביטויי�; עליה� להיות בני לפחות 3 �ותיות."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "שלח"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "שלח לי הודעות דרך Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "הגדרות"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "ההגדרות נשמרו."
 
@@ -2051,27 +2396,32 @@ msgid "Something weird happened."
 msgstr "קרה משהו מוזר."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "מקור"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "סטטיסטיקה"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "OpenID מ�וכסן ל� נמצ�."
 
@@ -2079,24 +2429,28 @@ msgstr "OpenID מ�וכסן ל� נמצ�."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "הירש� כמנוי"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "מנויי�"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "ההרשמה �ושרה"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "ההרשמה נדחתה"
 
@@ -2104,28 +2458,35 @@ msgstr "ההרשמה נדחתה"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "הרשמות"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "שגי�ת מערכת בהעל�ת הקובץ."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr ""
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "טקסט"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "חיפוש טקסט"
 
@@ -2145,6 +2506,7 @@ msgid "That confirmation code is not for you!"
 msgstr "קוד ה�ישור הזה �ינו מיועד לך!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr ""
 
@@ -2154,63 +2516,73 @@ msgid "That file is too big."
 msgstr "קובץ זה גדול מידי."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "זהו כבר זיהוי ה-Jabber שלך."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "זהו ל� זיהוי ה-Jabber שלך."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "זוהי כתובת מסרי� מידיי� שגויה."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "הכתובת \"%s\" �ושרה עבור חשבונך."
@@ -2219,11 +2591,14 @@ msgstr "הכתובת \"%s\" �ושרה עבור חשבונך."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "הכתובת הוסרה."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2232,7 +2607,8 @@ msgstr ""
 "המנוי �ושר, �בל ל� התקבלה כתובת �ליה ניתן לחזור. בדוק �ת הור�ות ה�תר וחפש "
 "כיצד ל�שר מנוי. �סימון המנוי שלך הו�:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2242,40 +2618,45 @@ msgstr ""
 "דחיית מנוי."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "�לה ה�נשי� במ�זיני� להודעות של %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "�לה ה�נשי� המ�זיני� להודעות שלך."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "�לה ה�נשי� ש%s מ�זין להודעות שלה�."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "�לה ה�נשי� שלהודעות שלה� �תה מ�זין."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "קוד �ישור זה ישן מידי. �נ� התחל מחדש."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr "טופס �מור לשלוח �ת עצמו �וטומטית. �� ל�, "
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2289,6 +2670,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
@@ -2297,25 +2681,37 @@ msgstr ""
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2327,18 +2723,21 @@ msgstr ""
 "openmublog%%), הכנס �ת כתובת הפרופיל שלך למטה. "
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "הכתובת של �תר הבית שלך, בלוג, �ו פרופיל ב�תר �חר "
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תו�� �חר"
 
@@ -2350,15 +2749,22 @@ msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תו��
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "הגשת טופס ל� צפויה."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "�יפוס סיסמה ל� צפוי."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr ""
 
@@ -2387,38 +2793,47 @@ msgstr "בטל מנוי"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "גירסה ל� נתמכת של OMB"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "פורמט התמונה �ינו נתמך."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "ההעלה"
 
@@ -2438,12 +2853,15 @@ msgid "Upload a new profile image"
 msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "לשימוש רק במקרי� של עידכוני�, הודעות מערכת, ושיחזורי סיסמ�ות"
 
@@ -2467,11 +2885,16 @@ msgstr "המשתמש �ליו �תה מ�זין �ינו קיי�."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "למשתמש �ין פרופיל."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "כינוי משתמש"
 
@@ -2480,29 +2903,33 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "מה המצב %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "מיקומך, למשל \"עיר, מדינה �ו מחוז, �רץ\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "סוג התמונה של '%s' �ינו מת�י�"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "גודל התמונה של: '%s' ל� מת�י�."
@@ -2510,7 +2937,9 @@ msgstr "גודל התמונה של: '%s' ל� מת�י�."
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "כן"
 
@@ -2531,11 +2960,12 @@ msgid "You are already logged in!"
 msgstr "כבר נכנסת למערכת!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2553,13 +2983,14 @@ msgstr "ניתן ליצור חשבון חדש ולהתחיל לפרס� הודע
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "הסיר OpenID מחשבונך על ידי לחיצה על הכפתור המסומן \"הסר\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2568,7 +2999,8 @@ msgstr ""
 "�פשר לשלוח ולקבל בודעות דרך Jabber/GTalk [instant messages](%%doc.im%%) הגדר "
 "�ת כתובתך והעדפותיך למטה."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "עדכן �ת הפרופיל ה�ישי שלך כ�ן, על מנת ש�נשי� יוכלו לדעת עליך יותר."
@@ -2577,21 +3009,23 @@ msgstr "עדכן ×�ת הפרופיל ×”×�ישי שלך ×›×�ן, על מנת ש×�×
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "ניתן להשתמש במנוי המקומי!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "ל� ניתן להירש� לל� הסכמה לרשיון"
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2605,35 +3039,39 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr ""
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "זוהית. הכנס סיסמה חדשה למטה."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "כתובת ה-OpenID שלך"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2642,47 +3080,57 @@ msgstr ""
 "מ�פשר לך להיכנס להרבה �תרי� בעזרת חשבון משתמש �חד. נהל �ת שיוך ה-OpenID "
 "מכ�ן. [OpenID](%%doc.openid%%)"
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "לפני מספר שניות"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "לפני כ-%d ימי�"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "לפני כ-%d שעות"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "לפני כ-%d דקות"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "לפני כ-%d חודשי�"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "לפני כיו�"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "לפני כדקה"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "לפני כחודש"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "לפני כשנה"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "לפני כשעה"
 
@@ -2704,12 +3152,14 @@ msgid "reply"
 msgstr "הגב"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "זהה לסיסמה למעלה"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr ""
 
@@ -2731,6 +3181,26 @@ msgstr "<< �חרי"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2739,6 +3209,7 @@ msgid "This notice is not a favorite!"
 msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -2746,22 +3217,28 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2771,11 +3248,13 @@ msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2815,33 +3294,44 @@ msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr ""
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "הודעה חדשה"
 
@@ -2895,6 +3385,11 @@ msgstr ""
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr ""
 
@@ -2923,6 +3418,8 @@ msgid "New password successfully saved. "
 msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2943,12 +3440,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2956,7 +3456,7 @@ msgstr ""
 msgid "No such message."
 msgstr ""
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
@@ -2980,51 +3480,70 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
@@ -3043,14 +3562,17 @@ msgid ""
 msgstr ""
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr ""
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr ""
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -3059,6 +3581,7 @@ msgid "Twitter Username"
 msgstr ""
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr ""
 
@@ -3067,24 +3590,29 @@ msgid "Twitter Password"
 msgstr ""
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -3095,33 +3623,43 @@ msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -3138,18 +3676,19 @@ msgid "The subscription has been rejected, but no "
 msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3159,89 +3698,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "�ודות: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3249,11 +3810,11 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3268,7 +3829,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -3280,7 +3841,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3289,31 +3850,39 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "מועדפי�"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "מתשמש"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr ""
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr ""
 
@@ -3326,14 +3895,19 @@ msgid "Twitter integration options"
 msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "�ל"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s וחברי�"
@@ -3343,22 +3917,32 @@ msgid "You can upload your personal avatar."
 msgstr ""
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "הגדרות"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
@@ -3375,35 +3959,44 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "�ין הודעה כזו."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr ""
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "�ין משתמש כזה."
@@ -3412,12 +4005,12 @@ msgstr "�ין משתמש כזה."
 msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 #, fuzzy
 msgid "You have already blocked this user."
 msgstr "כבר נכנסת למערכת!"
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3435,40 +4028,58 @@ msgstr ""
 msgid "Add to favorites"
 msgstr "מועדפי�"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "�ין כינוי"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "�ין הודעה כזו."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3478,16 +4089,17 @@ msgid "Nickname must have only lowercase letters "
 msgstr "כינוי יכול להכיל רק �ותיות �נגליות קטנות ומספרי�, ולל� רווחי�."
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "הביוגרפיה �רוכה מידי (לכל היותר 140 �ותיות)"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "עידכון המשתמש נכשל."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 #, fuzzy
 msgid "Options saved."
 msgstr "ההגדרות נשמרו."
@@ -3505,7 +4117,8 @@ msgstr ""
 msgid "Send me email when someone "
 msgstr ""
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3521,7 +4134,7 @@ msgstr ""
 "קוד �ישור נשלח �ל כתובת המסרי� המידיי� שהוספת. עליך ל�שר �ת %s לשליחת מסרי� "
 "מידיי� �ליך."
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3535,54 +4148,69 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "�ין תוכן!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 #, fuzzy
 msgid "After"
 msgstr "<< �חרי"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "לפני >>"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "הזנות החברי� של %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3628,12 +4256,14 @@ msgstr ""
 msgid "Sync preferences"
 msgstr "העדפות"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr ""
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "�ין הודעה כזו."
@@ -3648,7 +4278,8 @@ msgid "The most popular notices on the site right now."
 msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3662,15 +4293,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr ""
 
@@ -3678,12 +4311,14 @@ msgstr ""
 msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "התמונה עודכנה."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "עדכון התמונה נכשל."
@@ -3703,7 +4338,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "קבוצות"
 
@@ -3718,6 +4354,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "צור חשבון חדש"
@@ -3730,7 +4367,7 @@ msgstr ""
 "חפש �נשי� ב-%%site.name%% לפי ש�, מיקו�, �ו תחומי עניין. הפרד בעזרת רווחי� "
 "בין הביטויי�; עליה� להיות בני לפחות 3 �ותיות."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "חיפוש סיסמה"
@@ -3754,21 +4391,21 @@ msgstr "שלח לי הודעות דרך Jabber/GTalk."
 msgid "A confirmation code was sent "
 msgstr "�ין קוד �ישור."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "כבר נכנסת למערכת!"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "נכשלה ההפניה לשרת: %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr ""
@@ -3777,16 +4414,19 @@ msgstr ""
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "�ין הודעה כזו."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
@@ -3795,21 +4435,25 @@ msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
 msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr ""
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "נכשלה יצירת OpenID מתוך: %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -3821,16 +4465,18 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "שמירת מידע התמונה נכשל"
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "יצירת המנוי נכשלה."
@@ -3844,12 +4490,15 @@ msgstr "קובץ זה גדול מידי."
 msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 #, fuzzy
 msgid "Notice posted"
 msgstr "הודעות"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr ""
 
@@ -3866,7 +4515,7 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "כניסת OpenId"
@@ -3894,11 +4543,13 @@ msgstr ""
 msgid "Service"
 msgstr "חיפוש"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "ש� המיקו� �רוך מידי (מותר עד 255 �ותיות)."
@@ -3908,17 +4559,18 @@ msgstr "ש� המיקו� �רוך מידי (מותר עד 255 �ותיות)."
 msgid "Change your password."
 msgstr "שנה סיסמה"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "הסיסמה נשמרה."
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "ל� עומד בכללי� ל-OpenID."
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -3928,12 +4580,13 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "פרופיל ל� מוכר"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -3943,21 +4596,26 @@ msgid "Automatically subscribe to whoever "
 msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "כתובת �תר הבית '%s' �ינה חוקית"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "שמירת הפרופיל נכשלה."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "קו זמן ציבורי"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
@@ -3978,11 +4636,13 @@ msgstr "הזנת זר� הציבורי"
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4037,7 +4697,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "תגובת עבור %s"
@@ -4047,53 +4708,74 @@ msgstr "תגובת עבור %s"
 msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "�ין הודעה כזו."
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "הודעות"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "הזנת הודעות של %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "חבר מ�ז"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr ""
 
@@ -4108,7 +4790,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4119,33 +4801,40 @@ msgid "'s profile"
 msgstr "פרופיל"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "למשתמש �ין פרופיל."
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr ""
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 #, fuzzy
 msgid "Message"
 msgstr "הודעה חדשה"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "מנויי�"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr ""
 
@@ -4171,7 +4860,7 @@ msgstr "שלח לי הודעות דרך Jabber/GTalk."
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "קוד ה�ישור הזה �ינו מיועד לך!"
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr ""
 
@@ -4235,17 +4924,18 @@ msgstr "�לה ה�נשי� ש%s מ�זין להודעות שלה�."
 msgid "These are the people whose "
 msgstr "�לה ה�נשי� במ�זיני� להודעות של %s."
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "�ין זיהוי Jabber כזה."
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "מיקרובלוג מ�ת %s"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4269,7 +4959,7 @@ msgstr ""
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4279,17 +4969,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "שמירת מידע התמונה נכשל"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4298,20 +4988,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "�ין הודעה כזו."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "מיקרובלוג מ�ת %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "ל� נמצ�"
@@ -4320,16 +5013,17 @@ msgstr "ל� נמצ�"
 msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 #, fuzzy
 msgid "Twitter password"
 msgstr "סיסמה חדשה"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr ""
 
@@ -4342,157 +5036,166 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr ""
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "שגי�ה בשמירת המשתמש."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "השרת ל� החזיר כתובת פרופיל"
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 #, fuzzy
 msgid "No profile with that id."
 msgstr "�ין פרופיל תו�� לפרופיל המרוחק "
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "בטל מנוי"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr ""
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "בעיה בשמירת ההודעה."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 #, fuzzy
 msgid "Upload an avatar"
 msgstr "עדכון התמונה נכשל."
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr ""
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr ""
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Account"
 msgstr "�ודות"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "צור חשבון חדש"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "�ין OpenID כזה."
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "עזרה"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "הודעה חדשה"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "הודעה חדשה"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "הרשמות"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "�ין משתמש כזה."
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr ""
 
@@ -4505,12 +5208,15 @@ msgstr ""
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "צור חשבון חדש"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 #, fuzzy
 msgid "Published"
 msgstr "ציבורי"
@@ -4532,34 +5238,39 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "הכתובת של �תר הבית שלך, בלוג, �ו פרופיל ב�תר �חר "
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
 msgstr "הרשמות"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4569,21 +5280,21 @@ msgstr "מיקומך, למשל \"עיר, מדינה �ו מחוז, �רץ\""
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 #, fuzzy
 msgid "Logo"
 msgstr "צ�"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
@@ -4616,12 +5327,12 @@ msgstr "היכנס"
 msgid "Leave"
 msgstr "שמור"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "ש� המשתמש �ו הסיסמה ל� חוקיי�"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "צור חשבון חדש"
@@ -4642,24 +5353,24 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
 
-#: lib/mail.php:254
-#, fuzzy, php-format
+#: lib/mail.php:254 lib/mail.php:253
+#, php-format
 msgid "Location: %s\n"
 msgstr ""
 
-#: lib/mail.php:256
-#, fuzzy, php-format
+#: lib/mail.php:256 lib/mail.php:255
+#, php-format
 msgid "Homepage: %s\n"
 msgstr ""
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
@@ -4674,43 +5385,51 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "הודעה חדשה"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "לפחות 6 �ותיות"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 #, fuzzy
 msgid "in reply to"
 msgstr "בתגובה ל..."
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "הגב"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete"
 msgstr "מחק"
@@ -4732,27 +5451,29 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "ציבורי"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "�נשי�"
@@ -4770,32 +5491,34 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "הרשמה מרוחקת"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "הרשמה מרוחקת"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "למשתמש �ין פרופיל."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "ההרשמה �ושרה"
@@ -4810,11 +5533,12 @@ msgid "Top posters"
 msgstr ""
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 #, fuzzy
 msgid "Unblock this user"
 msgstr "�ין משתמש כזה."
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr ""
 
@@ -4822,9 +5546,2009 @@ msgstr ""
 msgid "Unsubscribe from this user"
 msgstr ""
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "הזנות החברי� של %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "הזנות החברי� של %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "הזנות החברי� של %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s וחברי�"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "התמונה עודכנה."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "מיקרובלוג מ�ת %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"חפש �נשי� ב-%%site.name%% לפי ש�, מיקו�, �ו תחומי עניין. הפרד בעזרת רווחי� "
+"בין הביטויי�; עליה� להיות בני לפחות 3 �ותיות."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "חיפוש ברצף �חרי \"%s\""
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr "לצרכי �בטחה, הכנס מחדש �ת ש� המשתמש והסיסמה לפני שתשנה �ת ההגדרות."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "הזנת זר� הציבורי"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "הזנת זר� הציבורי"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "הזנת זר� הציבורי"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "צור"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "�ין הודעה כזו."
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "פרופיל"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "תמונה"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "הגדרות הפרופיל"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "קוד ה�ישור הזה �ינו מיועד לך!"
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "�ין משתמש כזה."
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr ""
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"�� יש לך כבר חשבון, התחבר ע� ש� המשתמש והסיסמה שלך וקשר �ותו �ל ה-OpenID שלך."
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s מ�זין כעת להודעות שלך ב %2$s. \n"
+"\n"
+"\t%3$s\n"
+" שלך,\n"
+" %4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "חיפוש"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "�ין מסמך כזה."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "נכשלה ההפניה לשרת: %s"
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "�ין משתמש כזה."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "למשתמש �ין פרופיל."
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s וחברי�"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "�ין משתמש כזה."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "מיקו�"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "�ין הודעה כזו."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "כתובת �תר הבית '%s' �ינה חוקית"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "כינוי זה כבר תפוס. נסה כינוי �חר."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "שמירת מידע התמונה נכשל"
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "הודעה חדשה"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "הודעה חדשה"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "ש� משתמש ל� חוקי."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "למשתמש �ין פרופיל."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "�ין משתמש כזה."
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "קבוצות"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "העדפות נשמרו."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "�ין תוצ�ות"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "למשתמש �ין פרופיל."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "הודעה חדשה"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "שמירת הפרופיל נכשלה."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"מ�פשר לך להיכנס להרבה �תרי� בעזרת חשבון משתמש �חד. נהל �ת שיוך ה-OpenID "
+"מכ�ן. [OpenID](%%doc.openid%%)"
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "הגדרות הפרופיל"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+msgid ""
+"If you've 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
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "זוהית. הכנס סיסמה חדשה למטה."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "התבקש שיחזור סיסמה"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "שגי�ה ב�ישור הקוד."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "ההרשמה �ושרה"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "�ין הודעה כזו."
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "�ין משתמש כזה."
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "הסטטוס של %1$s ב-%2$s "
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "מיקרובלוג מ�ת %s"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "כל המנויי�"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "הגדרות הפרופיל"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "בעיה בשמירת ההודעה."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "למשתמש �ין פרופיל."
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "פרופיל"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "ההעלה"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "שנה סיסמה"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "התחבר"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "חיפוש"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "היכנס"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "צור חשבון חדש"
+msgid "Blocked"
+msgstr "�ין משתמש כזה."
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "�ין משתמש כזה."
 
-#~ msgid "Error inserting notice"
-#~ msgstr "שגי�ה בהכנסת ההוד�ה"
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "�ין תוכן!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "מתשמש"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "חיפוש"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "ל�תר הבית יש כתובת ל� חוקית."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "�ין הודעה כזו."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "נכשלה ההפניה לשרת: %s"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "הביוגרפיה �רוכה מידי (לכל היותר 140 �ותיות)"
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "כבר נכנסת למערכת!"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "נכשלה ההפניה לשרת: %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "נכשלה יצירת OpenID מתוך: %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "פרופיל"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "התמונה עודכנה."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "פורמט התמונה �ינו נתמך."
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "הביוגרפיה �רוכה מידי (לכל היותר 140 �ותיות)"
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "מיקרובלוג מ�ת %s"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "המשתמש �ליו �תה מ�זין �ינו קיי�."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "ל� מורשה."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "המרת �סימון הבקשה ל�סימון גישה ל� הצליחה."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "גירסה ל� מוכרת של פרוטוקול OMB"
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "�ין הודעה כזו."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "�ין הודעה כזו."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "מיקרובלוג מ�ת %s"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"היכנס בעזרת ש� המשתמש והסיסמה שלך. עדיין �ין לך ש� משתמש? [הרש�](%%action."
+"register%%) לחשבון "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "מיקרובלוג מ�ת %s"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "כל העידכוני� התו�מי� �ת החיפוש �חרי \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "התחבר"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "הביוגרפיה �רוכה מידי (לכל היותר 140 �ותיות)"
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Not a valid profile URL (no YADIS document)."
+
+#: 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 "�סימון הבקשה ל� התקבל."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "תגובת עבור %s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "הזנות החברי� של %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "הזנות החברי� של %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "הזנות החברי� של %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "הזנת הודעות של %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "הודעות"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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:249
+#, 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 ""
+"המנוי �ושר, �בל ל� התקבלה כתובת �ליה ניתן לחזור. בדוק �ת הור�ות ה�תר וחפש "
+"כיצד ל�שר מנוי. �סימון המנוי שלך הו�:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"המנוי נדחה, �בל ל� התקבלה כתובת לחזרה. בדוק �ת הור�ות ה�תר וחפש כיצד להשלי� "
+"דחיית מנוי."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "ל� ניתן לקרו� �ת ה-URL '%s' של התמונה"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "סוג התמונה של '%s' �ינו מת�י�"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "נכשלה ההפניה לשרת: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "הודעה חדשה"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "עידכון המשתמש נכשל."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "תגובת עבור %s"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "בעיה בשמירת ההודעה."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "�ין קוד �ישור."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "הודעה חדשה"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "עידכון המשתמש נכשל."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "הודעה חדשה"
diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo
index 36039f4aa..d300d88c4 100644
--- a/locale/is/LC_MESSAGES/statusnet.mo
+++ b/locale/is/LC_MESSAGES/statusnet.mo
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 524b85a0d..636d829fa 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -1,30 +1,29 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Icelandic
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-04-24 13:32+0000\n"
-"Last-Translator: Tryggvi Björgvinsson <tryggvib@hi.is>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:48+0000\n"
+"Language-Team: Icelandic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: is\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Leita í bablveitu að \"%s\""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -37,17 +36,19 @@ msgid " from "
 msgstr "frá"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Færslur sem svar til %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s hefur boðið þér að slást í hópinn með þeim á %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -83,8 +84,8 @@ msgstr ""
 "þekkir eða öðru áhugaverðu fólki í rauntíma.\n"
 "\n"
 "Þú getur líka sent inn fréttir af þér og deilt hugleiðingum og netveru þinni "
-"með fólki sem þekkir til þín. Þetta er frábær leið til þess að kynnast "
-"fólki sem hefur sömu áhugamál og þú.\n"
+"með fólki sem þekkir til þín. Þetta er frábær leið til þess að kynnast fólki "
+"sem hefur sömu áhugamál og þú.\n"
 "\n"
 "%1$s sagði:\n"
 "\n"
@@ -105,6 +106,7 @@ msgstr ""
 "Með bestu kveðju, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s er að hlusta á bablið þitt á %2$s."
@@ -127,25 +129,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Staða %1$s á %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Opinber bablveita"
@@ -155,34 +160,48 @@ msgstr "%s Opinber bablveita"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s og vinirnir"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Almenningsrás %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "Staða %s"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Rás %s"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s færslur frá öllum!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -190,16 +209,18 @@ msgstr ""
 "(Þú ættir að fá tölvupóst eftir smá stund. � tölvupóstinum eru leiðbeiningar "
 "um það hvernig þú staðfestir tölvupóstfangið þitt.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** er örbloggsþjónusta í boði "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site."
+"broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** er örbloggsþjónusta."
@@ -211,30 +232,35 @@ msgstr "Fulls nafns eða stuttnefnis efnishöfunda skal vera getið."
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
+msgstr ""
+"1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 eða fleiri tákn"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 eða fleiri tákn og ekki gleyma því!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 eða fleiri tákn. Nauðsynlegt"
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -244,6 +270,7 @@ msgstr ""
 "við. Þú verður að leyfa %s að senda snarskilaboð til þín."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -274,12 +301,39 @@ msgstr ""
 #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37
 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82
-#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79
+#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
+#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Aðferð í forritsskilum fannst ekki!"
 
@@ -300,18 +354,25 @@ msgstr "Aðferð í forritsskilum fannst ekki!"
 #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45
 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172
+#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "Aðferð í forritsskilum er í þróun."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Um"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Samþykkja"
 
@@ -322,6 +383,9 @@ msgstr "Samþykkja"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Bæta við"
 
@@ -339,27 +403,29 @@ msgstr "Bæta við eða fjarlægja OpenID"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Tölvupóstfang"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Tölvupóstfang vina sem þú vilt bjóða (eitt póstfang í hverja línu)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Allar áskriftir"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Allar færslur %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Allar færslur sem passa við \"%s\""
@@ -369,32 +435,39 @@ msgstr "Allar færslur sem passa við \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Þú hefur nú þegar skráð þig inn."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Þú ert nú þegar áskrifandi!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ertu viss um að þú viljir eyða þessu babli?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Heimila áskriftir"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila "
 "með þér!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -404,25 +477,30 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Mynd"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Mynd hefur verið uppfærð."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, 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 ""
 "Býð eftir staðfestingu frá þessu netfangi. Athugaðu Jabber/GTalk aðganginn "
-"þinn. Þar ættu að vera skilaboð með ítarlegri leiðbeiningum. (Hefurðu bætt "
-"%s við í vinalistann þinn?)"
+"þinn. Þar ættu að vera skilaboð með ítarlegri leiðbeiningum. (Hefurðu bætt %"
+"s við í vinalistann þinn?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -431,7 +509,7 @@ msgstr ""
 "ruslpóstinn þinn!). Þar ættu að vera skilaboð með ítarlegri leiðbeiningum."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Býð eftir staðfestingu varðandi þetta símanúmer."
 
@@ -442,6 +520,8 @@ msgstr "Eldri »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Lýsing"
 
@@ -449,16 +529,18 @@ msgstr "Lýsing"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Get ekki eytt þessu babli."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Get ekki lesið slóðina fyrir myndina '%s'"
@@ -466,6 +548,8 @@ msgstr "Get ekki lesið slóðina fyrir myndina '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Get ekki vistað nýja lykilorðið."
 
@@ -473,31 +557,34 @@ msgstr "Get ekki vistað nýja lykilorðið."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Hætta við"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Get ekki útbúið OpenID notandahlut."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Get ekki staðlað þetta Jabber kenni"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Get ekki staðlað þetta tölvupóstfang"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Breyta"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Breyta tölvupóstumsjón"
 
@@ -507,11 +594,12 @@ msgid "Change password"
 msgstr "Breyta lykilorði"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Breyta lykilorðinu þínu"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Breyta persónulegu stillingunum þínum"
 
@@ -521,6 +609,9 @@ msgstr "Breyta persónulegu stillingunum þínum"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Staðfesta"
 
@@ -533,12 +624,14 @@ msgstr "Staðfesta tölvupóstfang"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Hætt við staðfestingu."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Staðfestingarlykill"
 
@@ -547,7 +640,8 @@ msgstr "Staðfestingarlykill"
 msgid "Confirmation code not found."
 msgstr "Staðfestingarlykill fannst ekki."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -581,20 +675,24 @@ msgstr ""
 "Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Tengjast"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Tengja aðgang sem nú þegar er til"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Tengiliður"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Gat ekki búið til OpenID eyðublað: %s"
@@ -602,36 +700,40 @@ msgstr "Gat ekki búið til OpenID eyðublað: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 "Get ekki fylgst með notanda: %s. Þessi notandi er nú þegar í listanum þínum."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Get ekki fylgst með notanda: Notandinn finnst ekki."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Gat ekki framsent til vefþjóns: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Gat ekki vistað myndupplýsingar"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Gat ekki vistað nýjar persónuupplýsingar"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Gat ekki farið í áskrift."
 
@@ -651,15 +753,17 @@ msgstr "Gat ekki breytt beiðnistókum í aðgangstóka."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Gat ekki eytt áskrift."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Gat ekki fundið neinar notendastöður."
 
@@ -672,29 +776,38 @@ msgstr "Gat ekki komist yfir beiðnistóka."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Gat ekki sett inn staðfestingarlykil."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Gat ekki sett inn nýja áskrift."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Gat ekki vistað persónulega síðu."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Gat ekki uppfært notanda í sjálfvirka áskrift."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Gat ekki uppfært skráarfærslu notanda."
 
@@ -710,42 +823,48 @@ msgstr "Gat ekki uppfært skráarfærslu notanda."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Gat ekki uppfært notanda."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Búa til"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Búa til nýjan notanda með þessu stuttnefni."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Búa til nýjan aðgang"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Búa til nýjan aðgang fyrir OpenID sem nú þegar hefur notanda."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Núverandi staðfesta Jabber/GTalk snarskilaboðafangið."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Núverandi staðfesta SMS símanúmerið."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Núverandi staðfesta tölvupóstfangið."
 
@@ -754,23 +873,27 @@ msgid "Currently"
 msgstr "� gangi núna"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Eyða babli"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Lýstu þér og áhugamálum þínum í 140 táknum"
 
@@ -778,11 +901,13 @@ msgstr "Lýstu þér og áhugamálum þínum í 140 táknum"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Tölvupóstur"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Tölvupóstfang"
 
@@ -792,39 +917,43 @@ msgid "Email Settings"
 msgstr "Tölvupóstsstillingar"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Tölvupóstfang er nú þegar skráð."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Staðfesting tölvupóstfangs"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Tölvupóstfang eins og \"notandi@eitthvað.is\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Tölvupóstföng"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Sláðu inn stuttnefni eða tölvupóstfang."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Sláðu inn lykilinn sem þú fékkst í símann þinn."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Villa kom upp í heimilun tóka"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Villa kom upp í tengingu notanda við OpenID."
 
@@ -835,39 +964,46 @@ msgstr "Villa kom upp við að tengja notanda."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Villa kom upp við að setja inn mynd"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Villa kom upp við að setja inn nýja persónulega síðu"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Villa kom upp við að setja inn persónulega fjarsíðu"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Villa kom upp í vistun netfangsstaðfestingar."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Villa kom upp í vistun persónulegrar fjarsíðu"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Villa kom upp í vistun persónulegu síðunnar."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Villa kom upp í vistun notandans."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Villa kom upp í vistun notanda: ótækt."
 
@@ -876,6 +1012,9 @@ msgstr "Villa kom upp í vistun notanda: ótækt."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Villa kom upp í stillingu notanda."
 
@@ -886,6 +1025,7 @@ msgstr "Villa kom upp í uppfærslu persónulegu síðunnar"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
 
@@ -895,33 +1035,36 @@ msgid "Error with confirmation code."
 msgstr "Villa kom upp varðandi staðfestingarlykilinn."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Stuttnefni er nú þegar til"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "Spurt og svarað"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Mistókst að uppfæra mynd"
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Vinaveita %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Svaraveita %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Merkjaveita %s"
@@ -936,7 +1079,7 @@ msgstr "Finna innihald babls"
 msgid "Find people on this site"
 msgstr "Finna persónur á þessu vefsvæði"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -949,6 +1092,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Fullt nafn"
 
@@ -957,23 +1105,33 @@ msgstr "Fullt nafn"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Hjálp"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Heim"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Heimasíða"
 
@@ -981,21 +1139,27 @@ msgstr "Heimasíða"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Heimasíða er ekki gild vefslóð."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Ég vil babla í gegnum tölvupóst."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "Snarskilaboð"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Snarskilaboðafang"
 
@@ -1005,7 +1169,7 @@ msgid "IM Settings"
 msgstr "Snarskilaboðastillingar"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1013,7 +1177,7 @@ msgstr ""
 "Ef ert nú þegar með aðgang, skráðu þig inn með notendanafni og lykilorði til "
 "þess að tengjast OpenID aðganginum þínum."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1021,7 +1185,7 @@ msgstr ""
 "Ef þig langar til það bæta við OpenID í aðganginn þinn, sláðu það þá inn í "
 "reitinn hér fyrir neðan og smelltu á \"Bæta við\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1032,25 +1196,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Móttökutölvupóstur"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Móttökutölvupóstfang fjarlægt."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Rangt eldra lykilorð"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Rangt notendanafn eða lykilorð."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1059,30 +1229,31 @@ msgstr ""
 "sendar á tölvupóstfangið sem er tengt notendaaðganginum þínum."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Ótæk myndarslóð '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Ótækt tölvupóstfang: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ótæk heimasíða '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ótæk leyfisslóð '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Ótækt bablinnihald"
 
@@ -1097,13 +1268,13 @@ msgid "Invalid notice url"
 msgstr "Ótækt veffang babls"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Ótækt veffang persónulegrar síðu '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "Ótækt veffang persónulegrar síðu (vitlaust snið)"
 
@@ -1121,44 +1292,52 @@ msgstr "Ótæk stærð."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ótækt notendanafn eða lykilorð."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Boðskort hefur verið sent út"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Boðskort sent á eftirfarandi aðila:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Bjóða"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Bjóða nýjum notendum að vera með"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 ""
-"Það keyrir [StatusNet](http://status.net/) örbloggshugbúnaðinn, útgáfu %s, sem "
-"er gefinn út undir [GNU Affero "
-"almenningsleyfinu](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Það keyrir [StatusNet](http://status.net/) örbloggshugbúnaðinn, útgáfu %s, "
+"sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-kennið tilheyrir öðrum notanda."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1169,12 +1348,14 @@ msgstr ""
 "á GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Tungumál"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
 
@@ -1183,7 +1364,15 @@ msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Staðsetning"
 
@@ -1192,7 +1381,12 @@ msgstr "Staðsetning"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
 
@@ -1201,18 +1395,22 @@ msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Innskráning"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Innskráning með [OpenID](%%doc.openid%%) aðgangi."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1220,25 +1418,29 @@ msgid ""
 "%). "
 msgstr ""
 "Skráðu þig inn með notendanafninu þínu og lykilorði. Ertu ekki með "
-"notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu "
-"[OpenID](%%action.openidlogin%%). "
+"notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu [OpenID](%%"
+"action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Útskráning"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Tapað eða gleymt lykilorð?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Búa til nýtt tölvupóstfang til að senda til. Skrifar yfir það gamla."
 
@@ -1249,16 +1451,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Stilla það hvernig þú færð tölvupóst frá %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Meðlimur síðan"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Örblogg frá %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1271,42 +1475,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Textinn og skrárnar mínar eru aðgengilegar undir "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Nýtt"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nýtt tölvupóstfang til að senda á %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "Nýju móttökutölvupóstfangi bætt við."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Nýtt stuttnefni"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Nýtt babl"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
 
@@ -1316,7 +1528,13 @@ msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Stuttnefni"
 
@@ -1325,7 +1543,12 @@ msgstr "Stuttnefni"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
 
@@ -1334,47 +1557,58 @@ msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Stuttnefni ekki leyfilegt."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Stuttnefni notandans sem þú vilt fylgja"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Stuttnefni eða tölvupóstur"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "Nei"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Ekkert Jabber-kenni"
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Engin heimildarbeiðni!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Ekkert farsímafélag valið."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Enginn lykill sleginn inn"
 
@@ -1386,11 +1620,15 @@ msgstr "Enginn staðfestingarlykill."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Ekkert innihald!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Ekkert tölvupóstfang."
 
@@ -1399,7 +1637,9 @@ msgid "No id."
 msgstr "Ekkert kenni."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "Ekkert móttökutölvupóstfang."
 
@@ -1410,6 +1650,7 @@ msgstr "Ekkert stuttnefni uppgefið hjá hinum vefþjóninum."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Ekkert stuttnefni."
 
@@ -1417,12 +1658,14 @@ msgstr "Ekkert stuttnefni."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Engin staðfesting í bið sem þarf að hætta við."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Ekkert símanúmer."
 
@@ -1432,7 +1675,8 @@ msgid "No profile URL returned by server."
 msgstr "Ekkert veffang persónulegrar síðu skilað af vefþjóni."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Ekkert tölvupóstfang á skrá fyrir þennan notanda."
 
@@ -1444,7 +1688,7 @@ msgstr "Engin beiðni fundin!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Engar niðurstöður"
 
@@ -1455,12 +1699,16 @@ msgstr "Engin stærð."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Engin staða fundin með þessu kenni."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Engin staða með þessu kenni fannst."
 
@@ -1470,13 +1718,15 @@ msgid "No such OpenID."
 msgstr "Ekkert svoleiðis OpenID."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Ekkert svoleiðis skjal."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ekkert svoleiðis babl."
 
@@ -1514,12 +1764,22 @@ msgstr "Engin svoleiðis áskrift"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Enginn svoleiðis notandi."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "Enginn notandi með þetta tölvupóstfang eða notendanafn"
 
@@ -1533,32 +1793,38 @@ msgid "Not a recovery code."
 msgstr "Þetta er ekki staðfestingarlykill."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Ekki skráður notandi."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Enginn stuðningur við gagnasnið."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Ekki tækt Jabber-kenni"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Ekki tækt OpenID"
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Ekki tækt tölvupóstfang"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Ekki tækt tölvupóstfang."
 
@@ -1566,6 +1832,11 @@ msgstr "Ekki tækt tölvupóstfang."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Ekki tækt stuttnefni."
 
@@ -1585,7 +1856,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Ekki tækt veffang á persónulega síðu (ekkert YADIS skjal)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Annaðhvort ekki mynd eða þá að skráin er gölluð."
 
@@ -1596,11 +1868,13 @@ msgstr "Engin heimild."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Bjóst ekki við þessu svari!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Fannst ekki"
 
@@ -1616,11 +1890,15 @@ msgstr "Fannst ekki"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Ekki innskráð(ur)."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Ekki í áskrift!"
 
@@ -1637,39 +1915,44 @@ msgid "Notice feed for %s"
 msgstr "Bablveita fyrir %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Babl hefur enga persónulega síðu"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Babl"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Babl merkt með %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Eldra lykilorð"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "Uppsetning OpenID aðgangs"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "Sjálfvirk innsending OpenID"
 
@@ -1677,29 +1960,34 @@ msgstr "Sjálfvirk innsending OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "OpenID notendanafn"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "Veffang OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "OpenID heimild afturkölluð."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Tókst ekki að fá OpenID heimild: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID mistókst: %s"
@@ -1715,11 +2003,12 @@ msgid "OpenID settings"
 msgstr "Stillingar OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Upphal að hluta til."
 
@@ -1729,34 +2018,46 @@ msgstr "Upphal að hluta til."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Lykilorð"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Lykilorð og staðfesting passa ekki saman."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Beiðni um að endurheimta lykilorð hefur verið send inn"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Lykilorð vistað."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Lykilorðin passa ekki saman."
 
@@ -1776,14 +2077,17 @@ msgid "People search"
 msgstr "Leit að fólki"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Persónulegt"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Persónuleg skilaboð"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Símanúmer, með svæðisnúmeri ef við á, án greinarmerkja eða bila"
 
@@ -1798,7 +2102,7 @@ msgstr ""
 "áskrifandi að babli, smelltu þá á \"Hætta við\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Senda inn babl þegar Jabber/GTalk staðan breytist."
 
@@ -1807,7 +2111,9 @@ msgstr "Senda inn babl þegar Jabber/GTalk staðan breytist."
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Stillingar"
 
@@ -1816,42 +2122,52 @@ msgstr "Stillingar"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Stillingar vistaðar."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Tungumál (ákjósanlegt)"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Friðhelgi"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Vandamál komu upp við að vista babl."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Persónuleg síða"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "Veffang persónulegrar síðu"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Stillingar persónulegrar síðu"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Persónuleg síða þekkist ekki"
 
@@ -1860,17 +2176,19 @@ msgid "Public Stream Feed"
 msgstr "Skilaboðaveita almenningsrásarinnar"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Almenningsrás"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Birta MicroID fyrir Jabber/GTalk netfangið mitt."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Birta MicroID fyrir tölvupóstfangið mitt."
 
@@ -1880,12 +2198,14 @@ msgid "Recent Tags"
 msgstr "Nýleg merki"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Endurheimta"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Endurheimta lykilorð"
 
@@ -1898,37 +2218,45 @@ msgstr "Lykill fyrir endurheimtingu óþekkts notanda."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Nýskrá"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Nýskráning ekki leyfð."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Nýskráning tókst"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Hafna"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Muna eftir mér"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Persónuleg fjarsíða með engri persónulegri síðu sem passar"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Fara í fjaráskrift"
 
@@ -1942,6 +2270,9 @@ msgstr "Fara í fjaráskrift"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Fjarlægja"
 
@@ -1950,7 +2281,7 @@ msgstr "Fjarlægja"
 msgid "Remove OpenID"
 msgstr "Fjarlægja OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1959,34 +2290,41 @@ msgstr ""
 "Ef þú þarft að fjarlægja það, búðu þá til nýtt OpenID fyrst."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Svör"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Svör við %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Endurstilla"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Endurstilla lykilorð"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "SMS símanúmer"
 
@@ -1995,17 +2333,18 @@ msgstr "SMS símanúmer"
 msgid "SMS Settings"
 msgstr "SMS stillingar"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "SMS staðfesting"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Sama og lykilorðið hér fyrir ofan"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
 
@@ -2018,12 +2357,21 @@ msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Vista"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Leita"
 
@@ -2033,7 +2381,7 @@ msgid "Search Stream Feed"
 msgstr "Leita í bablveitu"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2042,7 +2390,7 @@ msgstr ""
 "Leita í innihaldi babls á %%site.name%%. Leitarorð eru aðskilin með bili og "
 "verða að vera að minnsta kosti 3 tákn."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2052,33 +2400,38 @@ msgstr ""
 "Leitarorð eru aðskilin með bili og verða að vera að minnsta kosti 3 tákn."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Veldu farsímafyrirtæki"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Senda"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Sendu tölvupóst á þetta póstfang til þess að senda inn nýtt babl."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Sendu mér tilkynningu varðandi nýjar áskriftir í gegnum tölvupóst."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Sendur mér babl í gegnum Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2087,16 +2440,19 @@ msgstr ""
 "farsímafyrirtækið rukki fyrir móttöku á SMSunum."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Sendu mér svör í gegnum Jabber/GTalk frá fólki sem ég er ekki áskrifandi að."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Stillingar"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Stillingar vistaðar."
 
@@ -2116,27 +2472,32 @@ msgid "Something weird happened."
 msgstr "Eitthvað undarlegt gerðist."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Því miður er móttökutölvupóstur ekki leyfður."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Frumþula"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Tölfræði"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Vista OpenID fannst ekki."
 
@@ -2144,24 +2505,28 @@ msgstr "Vista OpenID fannst ekki."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Gerast áskrifandi"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "�skrifendur"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "�skrift heimiluð"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "�skrift hafnað"
 
@@ -2169,28 +2534,35 @@ msgstr "�skrift hafnað"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "�skriftir"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Kerfisvilla kom upp við upphal skráar."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Merki"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Texti"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Textaleit"
 
@@ -2210,6 +2582,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Þessi staðfestingarlykill er ekki fyrir þig!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda."
 
@@ -2219,76 +2592,90 @@ msgid "That file is too big."
 msgstr "Þessi skrá er of stór."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Þetta er nú þegar Jabber-kennið þitt."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Þetta er nú þegar tölvupóstfangið þitt."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Þetta er nú þegar símanúmerið þitt."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Þetta er ekki Jabber-kennið þitt."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Þetta er ekki tölvupóstfangið þitt."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Þetta er ekki símanúmerið þitt."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Þetta er rangt snarskilaboðafang."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Þetta er rangur staðfestingarlykill."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Þetta símanúmer tilheyri nú þegar öðrum notanda."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Þetta er of langt. Hámarkslengd babls er 255 tákn."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Þetta tölvupóstfang, \"%s\", hefur verið staðfest fyrir aðganginn þinn."
+msgstr ""
+"Þetta tölvupóstfang, \"%s\", hefur verið staðfest fyrir aðganginn þinn."
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "Tölvupóstfangið hefur verið fjarlægt."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2298,7 +2685,8 @@ msgstr ""
 "leiðbeiningar síðunnar um það hvernig á að heimila áskrift. �skriftartókinn "
 "þinn er;"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2308,36 +2696,41 @@ msgstr ""
 "leiðbeiningar síðunnar um það hvernig á að hafna áskrift alveg."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Þetta er fólkið sem hlustar á bablið í %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Þetta er fólkið sem hlustar á bablið í þér."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Þetta er fólkið sem %s hlustar á bablið í."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Þetta er fólkið sem þú hlustar á bablið í."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Þetta fólk er nú þegar notendur og þú varðst sjálfkrafa áskrifandi að þeim:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 "Þessi staðfestingarlykill er of gamall. Vinsamlegast byrjaðu aftur upp á "
 "nýtt."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2346,7 +2739,7 @@ msgstr ""
 "innsendingartakkann til að fara til OpenID þjónustuaðilans þíns."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2361,6 +2754,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Þessi aðferð krefst POST eða DELETE."
 
@@ -2369,26 +2765,38 @@ msgstr "Þessi aðferð krefst POST eða DELETE."
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Þessi aðferð krefst POST."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 "Þessi síða er ekki aðgengileg í margmiðlunargerðinni sem þú tekur á móti"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Tímabelti"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Tímabelti ekki valið."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2401,20 +2809,23 @@ msgstr ""
 "persónulegu síðunnar þinnar hér fyrir neðan."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Tvo notendakenni eða skjáarnöfn verða að vera uppgefin."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 "Veffang heimasíðunnar þinnar, bloggsins þíns eða persónulegrar síðu á öðru "
 "vefsvæði"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
 
@@ -2426,15 +2837,22 @@ msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Bjóst ekki við innsendingu eyðublaðs."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Bjóst ekki við endurstillingu lykilorðs."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Óþekkt aðgerð"
 
@@ -2465,38 +2883,47 @@ msgstr "Fara úr áskrift"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "OMB útgáfa ekki studd"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Skráarsnið myndar ekki stutt."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Færslur sendar með SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Færslur sendar með snarskilaboðaþjónustu (instant messaging)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Færslur frá %1$s og vinum á %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Færslur frá %1$s á %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Hlaða upp"
 
@@ -2517,6 +2944,7 @@ msgid "Upload a new profile image"
 msgstr "Hlaða upp mynd á persónulega síðu"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -2524,7 +2952,9 @@ msgstr ""
 "þessa örbloggsþjónustu."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða."
@@ -2549,11 +2979,16 @@ msgstr "Notandi sem verið er að hlusta á er ekki til."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Notandi hefur enga persónulega síðu."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Stuttnefni notanda"
 
@@ -2562,29 +2997,33 @@ msgid "User not found."
 msgstr "Notandi fannst ekki."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "� hvaða tímabelti eru í rauninni?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Hvað er að frétta %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Röng gerð myndar fyrir '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Röng stærð myndar á '%s'"
@@ -2592,7 +3031,9 @@ msgstr "Röng stærð myndar á '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Já"
 
@@ -2615,11 +3056,12 @@ msgid "You are already logged in!"
 msgstr "Þú ert nú þegar innskráð(ur)!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Þú ert nú þegar í áskrift að þessum notendum:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "Þú ert ekki vinur þessa notanda."
 
@@ -2637,7 +3079,7 @@ msgstr "Þú getur búið til nýjan aðgang og byrjað að babla."
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Þú getur fengið SMS í gegnum tölvupóst frá %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
@@ -2646,6 +3088,7 @@ msgstr ""
 "hnappinn sem er merktur \"Fjarlægja\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2655,7 +3098,8 @@ msgstr ""
 "[snarskilaboðaþjónustuna](%%doc.im%%). Settu upp netfangið þitt hér fyrir "
 "neðan og stilltu notkunina."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2666,21 +3110,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Þú getur notað staðbundna áskrift!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Þú sendir okkur ekki þessa persónulegu síðu"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2702,16 +3148,19 @@ msgstr ""
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Þú getur ekki eytt stöðu annars notanda."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "Þú verður að vera innskráð(ur) til að geta boðið öðrum að nota %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2719,20 +3168,21 @@ msgstr ""
 "Við sendum þér tilkynningu þegar þeir sem þú býður samþykkja boðskortið og "
 "skrá sig á síðuna. Takk fyrir að stækka samfélagið!"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Auðkenning á þér tókst. Sláðu inn nýtt lykilorð hér fyrir neðan."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "OpenID veffangið þitt"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Stuttnefnið þitt á þessum vefþjóni eða skráða tölvupóstfangið."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2741,47 +3191,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) leyfir þér að skrá þig inn á mörg vefsvæði með sama "
 "notendaaðgangi. Stjórnaðu OpenID tengingunum þínum hér."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "fyrir nokkrum sekúndum"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "fyrir um %d dögum síðan"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "fyrir um %d klukkutímum síðan"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fyrir um %d mínútum síðan"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "fyrir um %d mánuðum síðan"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "fyrir um einum degi síðan"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "fyrir um einni mínútu síðan"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "fyrir um einum mánuði síðan"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "fyrir um einu ári síðan"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "fyrir um einum klukkutíma síðan"
 
@@ -2803,12 +3263,14 @@ msgid "reply"
 msgstr "svara"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "sama og lykilorðið hér fyrir ofan"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "skráargerð ekki studd"
 
@@ -2829,6 +3291,26 @@ msgstr "« Fyrri"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur."
 
@@ -2837,6 +3319,7 @@ msgid "This notice is not a favorite!"
 msgstr "Þetta babl er ekki í uppáhaldi!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Gat ekki eytt uppáhaldi."
 
@@ -2844,22 +3327,28 @@ msgstr "Gat ekki eytt uppáhaldi."
 msgid "Favor"
 msgstr "Uppáhald"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Senda mér tölvupóst þegar einhver sendir mér persónuleg skilaboð."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Þetta babl er nú þegar í uppáhaldi!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Gat ekki búið til uppáhald."
 
@@ -2869,11 +3358,13 @@ msgstr "Ekki uppáhald"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "Uppáhaldsbabl %s"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Bablveita uppáhaldsbabls %s"
@@ -2916,23 +3407,32 @@ msgid "Login with your username and password. "
 msgstr "Skráðu þig inn með notendanafni og lykilorði. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Enginn móttökuaðili tilgreindur."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Þú getur ekki sent þessum notanda skilaboð."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2940,11 +3440,13 @@ msgstr ""
 "staðinn."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "Enginn þannig notandi"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Ný skilaboð"
 
@@ -2983,7 +3485,8 @@ msgstr "Úthólf %s"
 
 #: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
-msgstr "Þetta er úthólfið þitt sem sýnir persónuleg skilaboð sem þú hefur sent."
+msgstr ""
+"Þetta er úthólfið þitt sem sýnir persónuleg skilaboð sem þú hefur sent."
 
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
@@ -3002,6 +3505,11 @@ msgstr "Þú getur uppfært persónulegar upplýsingar hérna "
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Notandi með enga persónulega síðu sem passar við"
 
@@ -3030,6 +3538,8 @@ msgid "New password successfully saved. "
 msgstr "Tókst að vista nýtt lykilorð. "
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn."
 
@@ -3053,12 +3563,15 @@ msgstr ""
 "Til þess að gerast áskrifandi getur þú [skráð þig inn](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Bablveita uppáhaldsbabls %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Gat ekki sótt uppáhaldsbabl."
 
@@ -3066,7 +3579,7 @@ msgstr "Gat ekki sótt uppáhaldsbabl."
 msgid "No such message."
 msgstr "Engin þannig skilaboð."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Aðeins sendandi og móttakandi geta lesið þessi skilaboð."
 
@@ -3090,51 +3603,70 @@ msgid "Mobile carrier for your phone. "
 msgstr "Farsímafélagið þitt. "
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Bein skilaboð til %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Öll bein skilaboð til %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Bein skilaboð sem þú hefur sent"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Öll bein skilaboð send frá %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Enginn texti í skilaboðum!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Móttakandi fannst ekki."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Uppáhaldsbabl frá %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s heldur upp á babl frá þér"
@@ -3154,17 +3686,19 @@ msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
 "Bættu Twitter aðganginum þínum við til að senda sjálfkrafa babl til Twitter, "
-""
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Twitter stillingar"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Twitter aðgangur"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Núverandi staðfesti Twitter aðgangurinn."
 
@@ -3173,6 +3707,7 @@ msgid "Twitter Username"
 msgstr "Twitter notendanafn"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Vinsamlegast engin bil."
 
@@ -3181,18 +3716,22 @@ msgid "Twitter Password"
 msgstr "Twitter lykilorð"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Sjálfkrafa senda bablið mitt á Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Senda staðbundin \"@\" svör til Twitter."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Gerast áskrifandi að Twitter vinum mínum hérna"
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3201,6 +3740,7 @@ msgstr ""
 "Hámarkslengd er 15 tákn."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "Gat ekki staðfest Twitter skilríkið!"
 
@@ -3211,33 +3751,43 @@ msgstr "Gat ekki sótt aðgangsupplýsingar fyrir \"%s\" frá Twitter"
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "Gat ekki vistað Twitter stillingarnar þínar!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Twitter stillingar vistaðar."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Þetta er ekki Twitter aðgangurinn þinn."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "Gat ekki fjarlægt Twitter notanda."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Twitter aðgangur fjarlægður."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "Gat ekki vistað Twitter stillingar."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Twitter stillingar vistaðar."
 
@@ -3254,18 +3804,19 @@ msgid "The subscription has been rejected, but no "
 msgstr "�skriftinni hefur verið hafnað en ófullnægjandi "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Niðurstöður skipunar"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Fullkláruð skipun"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Misheppnuð skipun"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin."
 
@@ -3275,89 +3826,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "�skriftir: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "Notandi hefur ekkert nýtt babl"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Babl gert að uppáhaldi."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt nafn: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Staðsetning: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Heimasíða: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Um: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Bein skilaboð send til %s"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Villa kom upp við að senda bein skilaboð"
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Nú ert þú áskrifandi að %s"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Nú ert þú ekki lengur áskrifandi að %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Skipun hefur ekki verið fullbúin"
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Tilkynningar af."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "Get ekki slökkt á tilkynningum."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Tilkynningar á."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Get ekki kveikt á tilkynningum."
 
@@ -3365,11 +3938,11 @@ msgstr "Get ekki kveikt á tilkynningum."
 msgid "Commands:\n"
 msgstr "Skipanir:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "Gat ekki skeytt skilaboðum inn í."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "Gat ekki uppfært skilaboð með nýju veffangi."
 
@@ -3386,7 +3959,7 @@ msgstr ""
 "Þú hefur fengið nýtt sendingarfang á %1$s.\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "Ný persónuleg skilaboð frá %s"
@@ -3400,7 +3973,7 @@ msgstr ""
 "%1$s (%2$s) sendi þér persónuleg skilaboð:\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
 
@@ -3409,31 +3982,39 @@ msgid "This form should automatically submit itself. "
 msgstr "Þetta eyðublað ætti sjálfkrafa að sendast inn. "
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Uppáhald"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Uppáhaldsbabl %s"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Notandi"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Innhólf"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Mótteknu skilaboðin þín"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Úthólf"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Skilaboð sem þú hefur sent"
 
@@ -3446,14 +4027,19 @@ msgid "Twitter integration options"
 msgstr "Samhæfnisvalmöguleikar Twitter"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "Til"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "Gat ekki þáttað skilaboðin."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s og vinirnir, síða %d"
@@ -3463,21 +4049,31 @@ msgid "You can upload your personal avatar."
 msgstr "Þú getur hlaðið upp þinni eigin sjálfsmynd."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Stillingar fyrir mynd"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Upphafleg mynd"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Forsýn"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Skera af"
 
@@ -3494,35 +4090,44 @@ msgid "There was a problem with your session token. "
 msgstr "Það kom upp vandamál með setutókann þinn. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 "Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Týndum skráargögnunum okkar"
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "Týndum skránni okkar"
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "Óþekkt skráargerð"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "Engin persónuleg síða tilgreind"
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "Engin persónulega síða með þessu einkenni"
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Loka á notanda"
 
@@ -3530,11 +4135,11 @@ msgstr "Loka á notanda"
 msgid "Are you sure you want to block this user? "
 msgstr "Ertu viss um að þú viljir loka á þennan notanda? "
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Þú hefur nú þegar lokað á þennan notanda."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "Mistókst að vista upplýsingar um notendalokun"
 
@@ -3551,38 +4156,56 @@ msgstr "Þú ert í þann mund að eyða þessu babli að eilífu. "
 msgid "Add to favorites"
 msgstr "Bæta við sem uppáhaldsbabli"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Breyta hópnum %s"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr "Innhólf verða að vera virk svo hópar virki"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "Ekkert stuttnefni"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "Enginn þannig hópur"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Þú verður að vera stjórnandi til að geta breytt hópnum"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Notaðu þetta eyðublað til að breyta hópnum."
 
@@ -3591,14 +4214,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr "Stuttnefni getur aðeins verið lágstafir"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "Gat ekki uppfært hóp."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "Valmöguleikar vistaðir."
 
@@ -3615,7 +4239,8 @@ msgstr "Búa til nýtt póstfang til að senda á; "
 msgid "Send me email when someone "
 msgstr "Senda mér tölvupóst þegar einhver "
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Leyfa vinum að ýta við mér og senda mér tölvupóst."
 
@@ -3628,7 +4253,7 @@ msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
 "Staðfestingarlykill var sendur til tölvupóstfangsins sem þú sendir inn. "
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "Kerfisvilla - gat ekki náð í notanda!"
 
@@ -3642,51 +4267,66 @@ msgstr "Ef þú vilt að %s forritið sjálfkrafa uppfæri "
 msgid "Allow %s to update my Facebook status"
 msgstr "Leyfa %s að uppfæra stöðuna mína á Facebook"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Sleppa"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr "Innihaldslaust babl!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Uppröðun"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "Eftir"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "�ður"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Takk fyrir að bjóða vinum þínum að nota %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "Boðskort hafa verið send til eftirfarandi notenda:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "Þér hefur verið boðið til %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr "Bjóddu vinum þínum að nota %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Vinir sem nú þegar nota %s:"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Senda boðskort"
@@ -3728,12 +4368,14 @@ msgstr "Ef þú vilt að %s uppfærist sjálfkrafa "
 msgid "Sync preferences"
 msgstr "Samstillingar"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Ekki lengur í uppáhaldi"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Vinsælt babl"
 
@@ -3747,7 +4389,8 @@ msgid "The most popular notices on the site right now."
 msgstr "Vinsælasta bablið á síðunni um þessar mundir."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Notendur í sviðsljósinu"
 
@@ -3761,15 +4404,17 @@ msgstr "Notendur í sviðsljósinu, síða %d"
 msgid "A selection of some of the great users on %s"
 msgstr "Úrval nokkurra frábærra notenda á %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "Ekkert einkenni"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Einkennismynd hópsins"
 
@@ -3777,11 +4422,13 @@ msgstr "Einkennismynd hópsins"
 msgid "You can upload a logo image for your group."
 msgstr "Þú getur hlaðið upp mynd fyrir hópinn þinn."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Einkennismynd uppfærð."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "Tókst ekki að uppfæra einkennismynd"
 
@@ -3800,7 +4447,8 @@ msgid "A list of the users in this group."
 msgstr "Listi yfir notendur í þessum hóp."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Hópar"
 
@@ -3815,6 +4463,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "Hópar á %%%%site.name%%%% leyfa þér að finna og tala við "
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "Búa til nýjan hóp"
 
@@ -3824,7 +4473,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr "Leita að hópum á %%site.name%% eftir nafni, staðsetningu eða lýsingu. "
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Hópleit"
 
@@ -3846,20 +4495,20 @@ msgstr "Sendu mér svör í gegnum Jabber/GTalk "
 msgid "A confirmation code was sent "
 msgstr "Staðfestingarlykill var sendur "
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "Þú ert nú þegar meðlimur í þessum hópi"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Gat ekki bætt notandanum %s í hópinn %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s bætti sér í hópinn %s"
@@ -3868,15 +4517,18 @@ msgstr "%s bætti sér í hópinn %s"
 msgid "Inboxes must be enabled for groups to work."
 msgstr "Innhólf verða að vera virk svo að hópar virki."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "Enginn þannig hópur."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "Þú ert ekki meðlimur í þessum hópi."
 
@@ -3884,21 +4536,25 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
 msgid "You may not leave a group while you are its administrator."
 msgstr "Þú getur ekki gengið úr hóp á meðan þú ert stjórnandi hópsins."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr "Gat ekki fundið meðlimaskrá."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s gekk úr hópnum %s"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "Skrá þig inn á síðuna"
 
@@ -3910,15 +4566,17 @@ msgstr "Engin núverandi staða"
 msgid "New group"
 msgstr "Nýr hópur"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "Gat ekki búið til hóp."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr "Gat ekki skráð hópmeðlimi."
 
@@ -3930,11 +4588,14 @@ msgstr "Þetta er of langt. "
 msgid "Don't send a message to yourself; "
 msgstr "Ekki senda þér þín eigin skilaboð; "
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "Babl sent inn"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Ajax villa"
 
@@ -3953,7 +4614,7 @@ msgstr "�tt við notanda"
 msgid "Nudge sent!"
 msgstr "�tt við notanda!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr "Innskráning með OpenID"
 
@@ -3977,30 +4638,32 @@ msgstr "Sjálfvirk stytting vefslóða"
 msgid "Service"
 msgstr "Þjónusta"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Þjónusta sem sér um sjálfkrafa styttingu."
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr ""
-"Þjónusta sjálfvirkrar vefslóðastyttingar er of löng (í mesta lagi 50 "
-"stafir)."
+"Þjónusta sjálfvirkrar vefslóðastyttingar er of löng (í mesta lagi 50 stafir)."
 
 #: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Breyta lykilorðinu þínu."
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr "Lykilorðabreyting"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Ekki gilt persónumerki: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Notendur sjálfmerktir með %s - síða %d"
@@ -4010,11 +4673,12 @@ msgstr "Notendur sjálfmerktir með %s - síða %d"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Þetta eru notendur sem hafa merkt sjálfa sig með \"%s\" "
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Upplýsingar á persónulegri síðu"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4026,20 +4690,25 @@ msgid "Automatically subscribe to whoever "
 msgstr "Sjálfkrafa gerast áskrifandi að þeim "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ógilt merki: \"%s\""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "Gat ekki vistað merki."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Almenningsrás, síða %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Gat ekki sótt efni úr almenningsveitu."
 
@@ -4049,8 +4718,8 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"Þetta er [örbloggssþjónustan](http://en.wikipedia.org/wiki/Micro-blogging) "
-"%%site.name%% "
+"Þetta er [örbloggssþjónustan](http://en.wikipedia.org/wiki/Micro-blogging) %%"
+"site.name%% "
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4061,11 +4730,13 @@ msgstr "Merkjaský almenningsins"
 msgid "These are most popular recent tags on %s "
 msgstr "Þetta eru vinsælustu nýlegu merkin á %s "
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "Merkjaský"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig."
 
@@ -4116,7 +4787,8 @@ msgstr ""
 "Þetta er staðbundinn persónuaðgangur! Skráðu þig inn til að gerast "
 "áskrifandi."
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Svör við %s, síða %d"
@@ -4126,50 +4798,71 @@ msgstr "Svör við %s, síða %d"
 msgid "%s favorite notices, page %d"
 msgstr "Uppáhaldsbabl %s, síða %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s hópurinn"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s hópurinn, síða %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Hópssíðan"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "Vefslóð"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr "Athugasemd"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Hópsaðgerðir"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr "Bablveita fyrir hópinn %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Meðlimir"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(Ekkert)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "Allir meðlimir"
 
@@ -4179,14 +4872,14 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** er notendahópur á [örbloggsþjónustunni](http://en.wikipedia.org/wiki"
-"/Micro-blogging) %%%%site.name%%%%  "
+"**%s** er notendahópur á [örbloggsþjónustunni](http://en.wikipedia.org/wiki/"
+"Micro-blogging) %%%%site.name%%%%  "
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
 msgstr "Aðeins sendandinn og móttakandi "
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, síða %d"
@@ -4196,30 +4889,37 @@ msgid "'s profile"
 msgstr "- Persónuleg síða"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "Persónuleg síða notanda"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Ljósmynd"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "Notandaaðgerðir"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "Senda bein skilaboð til þessa notanda"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Skilaboð"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "Allir áskrifendur"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "Allir hópar"
 
@@ -4229,9 +4929,8 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** hefur notendaaðgang á "
-"[örbloggsþjónustunni](http://en.wikipedia.org/wiki/Micro-blogging) "
-"%%%%site.name%%%%  "
+"**%s** hefur notendaaðgang á [örbloggsþjónustunni](http://en.wikipedia.org/"
+"wiki/Micro-blogging) %%%%site.name%%%%  "
 
 #: actions/smssettings.php:128
 msgid "Phone number, no punctuation or spaces, "
@@ -4243,9 +4942,10 @@ msgstr "Senda mér babl í gegnum SMS; "
 
 #: actions/smssettings.php:335
 msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Staðfestingarlykill hefur verið sendur í símanúmerið sem þú slóst inn. "
+msgstr ""
+"Staðfestingarlykill hefur verið sendur í símanúmerið sem þú slóst inn. "
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Farsímafyrirtæki"
 
@@ -4303,16 +5003,17 @@ msgstr "Þetta er fólkið þar sem bablið "
 msgid "These are the people whose "
 msgstr "Þetta er fólkið þar sem "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber snarskilaboðaþjónusta"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Babl merkt með %s, síða %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "Skilaboð merkt með \"%s\", nýlegustu skilaboðin fyrst"
@@ -4334,7 +5035,7 @@ msgstr "Merki %s"
 msgid "Tag user"
 msgstr "Merkja notanda"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4346,18 +5047,18 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "Það komu upp vandamál varðandi setutókann þinn."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Þú getur aðeins merkt fólk sem þú ert áskrifandi að eða þau sem eru "
 "áskrifendur að þér."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Gat ekki vistað merki."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Notaðu þetta eyðublað til að bæta við merkjum við áskrifendur þína eða þau "
@@ -4367,20 +5068,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "Ekkert þannig merki."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "Örblogg merkt með %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Mistókst að loka á notanda."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "Mistókst að opna fyrir notanda."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Fannst ekki."
 
@@ -4388,15 +5092,16 @@ msgstr "Fannst ekki."
 msgid "Add your Twitter account to automatically send "
 msgstr "Bættu við Twitter aðgangi þínum til að sjálfkrafa senda "
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Notendanafn á Twitter"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Lykilorð á Twitter"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Twitter vinir"
 
@@ -4409,147 +5114,156 @@ msgstr "Notendanafn má aðeins innihalda tölustafi, "
 msgid "Unable to retrieve account information "
 msgstr "Gat ekki náð í aðgangsupplýsingar "
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "Vill kom upp við að aflétta notendalokun."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "Ekkert einkenni persónulegrar síðu í beiðni."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "Enginn persónuleg síða með þessu einkenni."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Ekki lengur áskrifandi"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "Hópar %s"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Hópar %s, síða %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Gat ekki vistað babl. Óþekktur notandi."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar "
 "mínútur."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Hlaða upp einkennismynd"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Annað"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Aðrir valkostir"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Ónafngreind síða"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Stikl aðalsíðu"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Persónuleg síða og vinarás"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Leita að fólki eða texta"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Aðgangur"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 "Breyttu tölvupóstinum þínum, einkennismyndinni þinni, lykilorðinu þínu, "
 "persónulegu síðunni þinni"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Tengjast snarskilaboðaþjónustu, SMS, Twitter"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Skrá þig út af síðunni"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Skrá þig inn á síðuna"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Búa til aðgang"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "Skrá þig inn með OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "Hjálp!"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr "Babl vefsíðunnar"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "Staðbundin sýn"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr "Babl síðunnar"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Stikl undirsíðu"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Hugbúnaðarleyfi StatusNet"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "Allt "
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "leyfi."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "Loka á þennan notanda"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Loka"
 
@@ -4562,11 +5276,14 @@ msgstr "Taka þetta babl út sem uppáhald"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "Til að nota Facebook forritið %s verður þú að skrá þig inn "
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr " nýr aðgangur."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "Útgefið"
 
@@ -4586,31 +5303,36 @@ msgstr "Sía merki"
 msgid "All"
 msgstr "Allt"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Merki"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Veldu merki til að þrengja lista"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "�fram"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Lýsing"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\""
@@ -4619,20 +5341,20 @@ msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\""
 msgid "Group"
 msgstr "Hópur"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "Stjórnandi"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Breyta hópstillingum %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Einkennismerki"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Bæta við eða breyta einkennismerki %s"
@@ -4662,11 +5384,11 @@ msgstr "Gerast meðlimur"
 msgid "Leave"
 msgstr "Hætta sem meðlimur"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Skráðu þig inn með notendanafni og lykilorði"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Búðu til nýjan aðgang"
 
@@ -4688,17 +5410,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s hlustar núna á "
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Staðsetning: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Vefsíða: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4707,7 +5429,7 @@ msgstr ""
 "Lýsing: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s ýtti við þér"
@@ -4722,39 +5444,47 @@ msgstr "%1$s (%2$s) er að spá hvað þú ert að gera "
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s bætti við bablinu þínu af %2$s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "Frá"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Senda bein skilaboð"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "Senda babl"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Leyfileg tákn"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "sem svar við"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Svara þessu babli"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Svara"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Eyða þessu babli"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Eyða"
 
@@ -4775,27 +5505,29 @@ msgstr "�ta við þessum notanda"
 msgid "Tags in %s's notices"
 msgstr "Merki í babli %s"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(ekkert)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Almenn"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Notendahópar"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Nýleg merki"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "� sviðsljósinu"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Vinsælt"
 
@@ -4811,31 +5543,33 @@ msgstr "Finna hópa á þessari síðu"
 msgid "Untitled section"
 msgstr "Ónafngreindur hluti"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Fólk sem %s er áskrifandi að"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Fólk sem eru áskrifendur að %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Hópar sem %s er meðlimur í"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Notandinn hefur lokað á þig."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Gerast áskrifandi að þessum notanda"
 
@@ -4848,13 +5582,1962 @@ msgid "Top posters"
 msgstr "Aðalbablararnir"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Opna á þennan notanda"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Opna"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Hætta sem áskrifandi að þessum notanda"
+
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr ""
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr ""
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+msgid "You and friends"
+msgstr ""
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:373
+msgid "Avatar deleted."
+msgstr ""
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, php-format
+msgid "Microblog by %s group"
+msgstr ""
+
+#: actions/groupsearch.php:57 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 ""
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr ""
+
+#: actions/openidlogin.php:66
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr ""
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr ""
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+msgid "Public Stream Feed (Atom)"
+msgstr ""
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr ""
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+msgid "Your profile"
+msgstr ""
+
+#: actions/showstream.php:149
+#, php-format
+msgid "%s's profile"
+msgstr ""
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr ""
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+msgid "Edit Avatar"
+msgstr ""
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+msgid "Edit profile settings"
+msgstr ""
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+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 ""
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+msgid "No such user!"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr ""
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+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/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, 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 ""
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+msgid "Search site"
+msgstr ""
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr ""
+
+#: actions/block.php:149
+msgid "Do not block this user from this group"
+msgstr ""
+
+#: actions/block.php:150
+msgid "Block this user from this group"
+msgstr ""
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr ""
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr ""
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr ""
+
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr ""
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr ""
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr ""
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+msgid "Could not create aliases."
+msgstr ""
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+msgid "No notice id"
+msgstr ""
+
+#: actions/file.php:38
+msgid "No notice"
+msgstr ""
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+msgid "Not a valid invitation code."
+msgstr ""
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr ""
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr ""
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr ""
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+msgid "Couldn't update your design."
+msgstr ""
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+msgid "Design preferences saved."
+msgstr ""
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr ""
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr ""
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+msgid "Message sent"
+msgstr ""
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+msgid "Couldn't save file."
+msgstr ""
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+msgid "View profile designs"
+msgstr ""
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+msgid ""
+"If you've 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've been identified. Enter a new password below. "
+msgstr ""
+
+#: actions/recoverpassword.php:188
+msgid "Password recover"
+msgstr ""
+
+#: actions/register.php:86
+msgid "Sorry, invalid invitation code."
+msgstr ""
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr ""
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s's favorite notices, page %d"
+msgstr ""
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr ""
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr ""
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+msgid "Not a local notice"
+msgstr ""
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:121
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr ""
+
+#: actions/tag.php:77 actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:91 actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+msgid "Could not determine source user."
+msgstr ""
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+msgid "Could not find target user."
+msgstr ""
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr ""
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr ""
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+msgid "Reject this subscription"
+msgstr ""
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr ""
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr ""
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+msgid "Problem saving notice. Too long."
+msgstr ""
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+msgid "Design your profile"
+msgstr ""
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr ""
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr ""
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr ""
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr ""
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr ""
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Blocked"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "%s blocked users"
+msgstr ""
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+msgid "in context"
+msgstr ""
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+msgid "Search help"
+msgstr ""
+
+#: 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/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr ""
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Ekkert þannig merki."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Bein skilaboð til %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Get ekki fylgst með notanda: Notandinn finnst ekki."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Þú ert nú þegar meðlimur í þessum hópi"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Gat ekki bætt notandanum %s í hópinn %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Þú ert ekki meðlimur í þessum hópi."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Hópar %s"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Hópar sem %s er meðlimur í"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Hópsaðgerðir"
+
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr ""
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Skráarsnið myndar ekki stutt."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Ljósmynd"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Færslur frá %1$s á %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Notandi sem verið er að hlusta á er ekki til."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Engin heimild."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Gat ekki breytt beiðnistókum í aðgangstóka."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Óþekkt útgáfa OMB samskiptamátans."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Ekkert svoleiðis babl."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Týndum skránni okkar"
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Færslur frá %1$s á %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Þessi síða er ekki aðgengileg í "
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Skráðu þig inn með notendanafninu þínu og lykilorði. Ertu ekki með "
+"notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu [OpenID](%%"
+"action.openidlogin%%). "
+
+#: actions/noticesearchrss.php:89
+#, php-format
+msgid "Updates with \"%s\""
+msgstr ""
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Allar færslur sem passa við \"%s\""
+
+#: actions/oembed.php:157
+msgid "content type "
+msgstr ""
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Lýstu þér og áhugamálum þínum í 140 táknum"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Lýstu þér og þínum "
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Ekki tækt veffang á persónulega síðu (ekkert YADIS skjal)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
+"Þetta er staðbundinn persónuaðgangur! Skráðu þig inn til að gerast "
+"áskrifandi."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Gat ekki komist yfir beiðnistóka."
+
+#: actions/replies.php:144
+#, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/replies.php:151
+#, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Bablveita fyrir hópinn %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Skilaboð til %1$s á %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Bablveita uppáhaldsbabls %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Bablveita uppáhaldsbabls %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Bablveita uppáhaldsbabls %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "%s hópurinn"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Babl sent inn"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Þessi síða er ekki aðgengileg í "
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Bablveita fyrir %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Vinsamlegast athugaðu þessi atriði til þess að vera viss um að þú viljir "
+"gerast áskrifandi að babli þessa notanda. Ef þú baðst ekki um að gerast "
+"áskrifandi að babli, smelltu þá á \"Hætta við\"."
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"�skriftin hefur verið heimiluð en afturkallsveffang var ekki sent. Athugaðu "
+"leiðbeiningar síðunnar um það hvernig á að heimila áskrift. �skriftartókinn "
+"þinn er;"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"�skriftinni hefur verið hafnað en afturkallsveffang var ekki sent. Athugaðu "
+"leiðbeiningar síðunnar um það hvernig á að hafna áskrift alveg."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Get ekki lesið slóðina fyrir myndina '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Röng gerð myndar fyrir '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Gat ekki framsent til vefþjóns: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Hugbúnaðarleyfi StatusNet"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "�tt við notanda"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Svara þessu babli"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Vandamál komu upp við að vista babl."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Enginn staðfestingarlykill."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Skrá þig inn á síðuna"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Veldu farsímafyrirtæki"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Bablveita fyrir %s"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s heldur upp á babl frá þér"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "frá"
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Gat ekki eytt uppáhaldi."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Eyða babli"
diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo
index 00ab59804..0591c46a4 100644
--- a/locale/it/LC_MESSAGES/statusnet.mo
+++ b/locale/it/LC_MESSAGES/statusnet.mo
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 1a59adf85..da50319b7 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -1,57 +1,54 @@
-# Italian translation of statusnet
-# Copyright (C) 2008 THE statusnet'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the statusnet package.
-# Milo Casagrande <milo@ubuntu.com>, 2008
-#
+# Translation of StatusNet to Italian
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: statusnet\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-06-04 14:09+0000\n"
-"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
-"Language-Team: Italian <tp@lists.linux.it>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:52+0000\n"
+"Language-Team: Italian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: it\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Ricerca \"%s\" nel flusso"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
 " a eccezione di questi dati personali: password, indirizzo email, indirizzo "
 "messaggistica istantanea, numero di telefono."
 
-# è quello che si vede come descrizione da dove si è inviato il messaggio. Mettere 'da' non suona bene ('da web', 'da api'...), 'via' mi pare la soluzione migliore ('via web', 'via api', 'via Twhirl'...).
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
 msgstr " via "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Aggiornamenti in risposta a %2$s"
 
-#  %USERNAME has invited you to join THEM on %site. You start with a singular and end with a plural???
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "Hai ricevuto un invito per seguire %1$s su %2$s"
 
-# resa il più 'asessuale' possibile...
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -109,6 +106,7 @@ msgstr ""
 "Cordiali saluti, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s."
@@ -131,26 +129,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s aggiornamenti in risposta agli aggiornamenti da %2$s / %3$s"
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Stato di %1$s su %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "Attività pubblica di %s"
@@ -160,36 +160,48 @@ msgstr "Attività pubblica di %s"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amici"
 
-#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "attività pubblica di %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "stato di %s"
 
-#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Attività di %s"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Aggiornamenti di %s da tutti!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -197,16 +209,18 @@ msgstr ""
 "(Dovresti ricevere, entro breve, un messaggio email con istruzioni su come "
 "confermare il tuo indirizzo email.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** è un servizio di micro-blog offerto da "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** è un servizio di micro-blog offerto da [%%site.broughtby%%]"
+"(%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** è un servizio di micro-blog. "
@@ -219,34 +233,36 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 lettere minuscole o numeri, niente punteggiatura o spazi. Richiesto."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 o più caratteri"
 
-#  messa al femminile... dovrebbe essere la password
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o più caratteri, e non dimenticarla!"
 
-#  Femminile, è la password
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 o più caratteri. Richiesta."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -256,6 +272,7 @@ msgstr ""
 "istantanea che hai aggiunto. Devi approvare %s affinché ti invii messaggi."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -291,7 +308,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Metodo delle API non trovato!"
 
@@ -314,16 +358,23 @@ msgstr "Metodo delle API non trovato!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "Metodo delle API in lavorazione."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Informazioni"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Accetta"
 
@@ -334,6 +385,9 @@ msgstr "Accetta"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -342,7 +396,6 @@ msgstr "Aggiungi"
 msgid "Add OpenID"
 msgstr "Aggiungi OpenID"
 
-#  we don't use 's' in plurals even from english words.
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 #: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
@@ -352,27 +405,29 @@ msgstr "Aggiungi o rimuovi OpenID"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Indirizzo"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Indirizzi email di amici da invitare (uno per riga)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Tutti gli abbonamenti"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Tutti gli aggiornamenti di %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Tutti gli aggiornamenti corrispondenti al termine di ricerca \"%s\""
@@ -382,30 +437,37 @@ msgstr "Tutti gli aggiornamenti corrispondenti al termine di ricerca \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Accesso già effettuato."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Già abbonato!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Sei sicuro di voler eliminare questo messaggio?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorizza abbonamento"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -415,15 +477,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Immagine"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Immagine aggiornata."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -434,6 +500,7 @@ msgstr ""
 "elenco contatti?)."
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -442,7 +509,7 @@ msgstr ""
 "(e anche la posta indesiderata!) per un messaggio con ulteriori istruzioni."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Attesa la conferma per questo numero di telefono."
 
@@ -453,6 +520,8 @@ msgstr "Precedenti »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Biografia"
 
@@ -460,16 +529,18 @@ msgstr "Biografia"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "La biografia è troppo lunga (max 140 caratteri)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Impossibile eliminare questo messaggio."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Impossibile leggere l'URL \"%s\" dell'immagine"
@@ -477,6 +548,8 @@ msgstr "Impossibile leggere l'URL \"%s\" dell'immagine"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Impossibile salvare la nuova password."
 
@@ -484,31 +557,34 @@ msgstr "Impossibile salvare la nuova password."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Annulla"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Impossibile creare l'oggetto OpenID consumer."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossibile normalizzare quell'ID Jabber"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Impossibile normalizzare l'indirizzo email"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Modifica"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Modifica la gestione dell'email"
 
@@ -518,11 +594,12 @@ msgid "Change password"
 msgstr "Modifica password"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Modifica la tua password"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Modifica le impostazioni del tuo profilo"
 
@@ -532,6 +609,9 @@ msgstr "Modifica le impostazioni del tuo profilo"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Conferma"
 
@@ -544,12 +624,14 @@ msgstr "Conferma indirizzo"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Conferma annullata."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Codice di conferma"
 
@@ -558,7 +640,8 @@ msgstr "Codice di conferma"
 msgid "Confirmation code not found."
 msgstr "Codice di conferma non trovato."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -592,20 +675,24 @@ msgstr ""
 "servizio."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Connetti"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Collega a un account esistente"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Contatti"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Impossibile creare il modulo OpenID: %s"
@@ -613,35 +700,39 @@ msgstr "Impossibile creare il modulo OpenID: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Impossibile seguire l'utente: %s è già nel tuo elenco."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Impossibile seguire l'utente: utente non trovato."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Impossibile redirigere al server: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Impossibile salvare le informazioni dell'immagine"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Impossibile salvare le nuove informazioni del profilo"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Impossibile abbonare altri a te."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Impossibile abbonarsi."
 
@@ -662,15 +753,17 @@ msgstr ""
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Impossibile eliminare l'email di conferma."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Impossibile eliminare l'abbonamento."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Impossibile trovare un qualsiasi stato."
 
@@ -683,29 +776,38 @@ msgstr "Impossibile ottenere un token di richiesta."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Impossibile inserire il codice di conferma."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Impossibile salvare il profilo."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Impossibile aggiornare il record dell'utente."
 
@@ -721,69 +823,77 @@ msgstr "Impossibile aggiornare il record dell'utente."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Impossibile aggiornare l'utente."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Crea"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Crea un nuovo utente con questo soprannome."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Crea un nuovo account"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Creazione nuovo account per OpenID che ha già un utente."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Indirizzo Jabber/GTalk attualmente confermato."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Numero di telefono attualmente confermato per gli SMS."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Indirizzo email attualmente confermato."
 
-# aggiunti i due punti, dopo questa stringa c'è lo stato attuale di un utente nella pagina del suo profilo
 #: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "In questo momento:"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Errore del DB nell'inserire un hashtag: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Errore del DB nell'inserire la risposta: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Elimina messaggio"
 
-# per renderla 'asessuale' il più possibile...
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Descriviti assieme ai tuoi interessi in 140 caratteri"
 
@@ -791,11 +901,13 @@ msgstr "Descriviti assieme ai tuoi interessi in 140 caratteri"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Email"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Indirizzo email"
 
@@ -805,39 +917,43 @@ msgid "Email Settings"
 msgstr "Impostazioni email"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Indirizzo email già esistente."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Conferma indirizzo email"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Indirizzo email, del tipo \"NomeUtente@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Indirizzi email"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Inserisci un soprannome o un indirizzo email."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Errore nell'autorizzare il token"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Errore nel collegare l'utente a OpenID."
 
@@ -848,39 +964,46 @@ msgstr "Errore nel connettere l'utente."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Errore nell'inserire l'immagine"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Errore nell'inserire il nuovo profilo"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Errore nell'inserire un profilo remoto"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Errore nel salvare la conferma dell'indirizzo."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Errore nel salvare il profilo remoto"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Errore nel salvare il profilo."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Errore nel salvare l'utente."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Errore nel salvare l'utente; non valido."
 
@@ -889,6 +1012,9 @@ msgstr "Errore nel salvare l'utente; non valido."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Errore nell'impostare l'utente."
 
@@ -899,6 +1025,7 @@ msgstr "Errore nell'aggiornare il profilo"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Errore nell'aggiornare il profilo remoto"
 
@@ -908,33 +1035,36 @@ msgid "Error with confirmation code."
 msgstr "Errore con il codice di conferma."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Soprannome esistente"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Errore nell'aggiornare l'immagine."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed per gli amici di %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed per le risposte a %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Feed per l'etichetta %s"
@@ -949,7 +1079,7 @@ msgstr "Ricerca contenuto dei messaggi"
 msgid "Find people on this site"
 msgstr "Ricerca persone in questo sito"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -962,6 +1092,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Nome"
 
@@ -970,23 +1105,33 @@ msgstr "Nome"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nome troppo lungo (max 255 caratteri)"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Aiuto"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Home"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Pagina web"
 
@@ -994,22 +1139,27 @@ msgstr "Pagina web"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "L'URL della pagina web non è valido."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Voglio inviare i messaggi via email"
 
-#  Non è il massimo (Messaggistica Istantanea), ma non lo è nemmeno in inglese, questo tipo di abbreviazioni sarebbe da evitare sempre...
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "MI"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Indirizzo di messaggistica istantanea"
 
@@ -1019,7 +1169,7 @@ msgid "IM Settings"
 msgstr "Impostazioni messaggistica istantanea"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1027,7 +1177,7 @@ msgstr ""
 "Se hai già un account, esegui l'accesso col tuo nome utente e la tua "
 "password per connetterlo al tuo OpenID."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1035,7 +1185,7 @@ msgstr ""
 "Se vuoi aggiungere un OpenID al tuo account, inseriscilo nel riquadro "
 "sottostante e fai clic su \"Aggiungi\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1046,25 +1196,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Email di ricezione"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Indirizzo email di ricezione rimosso."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Vecchia password non corretta"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Nome utente o password non corretto."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1073,30 +1229,31 @@ msgstr ""
 "all'indirizzo email registrato nel tuo account."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "URL \"%s\" dell'immagine non valido"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Indirizzo email non valido: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Pagina web \"%s\" non valida"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "URL \"%s\" della licenza non valido"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Contenuto del messaggio non valido"
 
@@ -1111,13 +1268,13 @@ msgid "Invalid notice url"
 msgstr "URL del messaggio non valido"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "URL \"%s\" del profilo non valido"
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "URL del profilo non valido (formato errato)"
 
@@ -1135,28 +1292,35 @@ msgstr "Dimensione non valida."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nome utente o password non valido."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Inviti inviati"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Inviti inviati alle seguenti persone:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Invita"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Invita nuovi utenti"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1164,15 +1328,16 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 "Gestito dal software di micro-blog [StatusNet](http://status.net/), versione "
-"%s, disponibile sotto licenza [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"%s, disponibile sotto licenza [GNU Affero General Public License](http://www."
+"fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "ID Jabber già assegnato a un altro utente."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1183,12 +1348,14 @@ msgstr ""
 "di messaggistica o su GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Lingua"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "La lingua è troppo lunga (max 50 caratteri)."
 
@@ -1197,7 +1364,15 @@ msgstr "La lingua è troppo lunga (max 50 caratteri)."
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Ubicazione"
 
@@ -1206,7 +1381,12 @@ msgstr "Ubicazione"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 
@@ -1215,18 +1395,22 @@ msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Accedi"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Accedi con un account [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1237,22 +1421,26 @@ msgstr ""
 "(%%action.register%%) un nuovo account o prova [OpenID](%%action.openidlogin%"
 "%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Esci"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Password persa o dimenticata?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Crea un nuovo indirizzo email a cui inviare i messaggi, rimuove quello "
@@ -1265,16 +1453,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestisci la ricezione delle email da %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Membro dal"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Micro-blog di %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1286,42 +1476,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "I miei testi e file sono disponibili sotto "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Nuovo"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nuovo indirizzo email per inviare messaggi a %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Nuovo soprannome"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Nuovo messaggio"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nuova password"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
 
@@ -1331,7 +1529,13 @@ msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Soprannome"
 
@@ -1340,7 +1544,12 @@ msgstr "Soprannome"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome già in uso. Prova con un altro."
 
@@ -1349,49 +1558,60 @@ msgstr "Soprannome già in uso. Prova con un altro."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
 "spazi."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Soprannome non consentito."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Soprannome dell'utente che vuoi seguire"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Soprannome o email"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "No"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Nessun ID di Jabber."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Nessuna richiesta di autorizzazione!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Nessun operatore selezionato."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Nessun codice inserito"
 
@@ -1403,11 +1623,15 @@ msgstr "Nessun codice di conferma."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Nessun contenuto!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Nessun indirizzo email."
 
@@ -1416,7 +1640,9 @@ msgid "No id."
 msgstr "Nessun ID."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "Nessun indirizzo email di ricezione."
 
@@ -1427,6 +1653,7 @@ msgstr "Nessun soprannome fornito dal server remoto."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Nessun soprannome."
 
@@ -1434,12 +1661,14 @@ msgstr "Nessun soprannome."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Nessuna conferma da annullare."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Nessun numero di telefono."
 
@@ -1449,7 +1678,8 @@ msgid "No profile URL returned by server."
 msgstr "Nessun URL di profilo restituito dal server."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Nessun indirizzo email registrato per quell'utente."
 
@@ -1461,7 +1691,7 @@ msgstr "Nessuna richiesta trovata!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Nessun risultato"
 
@@ -1472,12 +1702,16 @@ msgstr "Nessuna dimensione."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Nessuno stato trovato con quel ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Nessuno stato con quel ID trovato."
 
@@ -1487,13 +1721,15 @@ msgid "No such OpenID."
 msgstr "Nessun tale OpenID."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Nessun tale documento."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nessun tale messaggio."
 
@@ -1531,12 +1767,22 @@ msgstr "Nessun tale abbonamento"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Nessun tale utente."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "Nessun utente con quell'email o nome utente."
 
@@ -1550,32 +1796,38 @@ msgid "Not a recovery code."
 msgstr "Non è un codice di ripristino."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Non è un utente registrato."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Non è un formato di dati supportato."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Non è un ID Jabber valido"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Non è un OpenID valido."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Non è un indirizzo email valido"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Non è un indirizzo email valido."
 
@@ -1583,6 +1835,11 @@ msgstr "Non è un indirizzo email valido."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Non è un soprannome valido."
 
@@ -1602,7 +1859,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Non è un URL di profilo valido (nessun documento YADIS)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Non è un'immagine o il file è danneggiato."
 
@@ -1613,11 +1871,13 @@ msgstr "Non autorizzato."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Non aspettavo questa risposta!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Non trovato"
 
@@ -1633,11 +1893,15 @@ msgstr "Non trovato"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Non connesso."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Non abbonato!"
 
@@ -1654,39 +1918,44 @@ msgid "Notice feed for %s"
 msgstr "Feed dei messaggi per %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Il messaggio non ha un profilo"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Messaggi"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Messaggi etichettati con %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Vecchia password"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "Configurazione account OpenID"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "Auto-invio OpenID"
 
@@ -1694,29 +1963,34 @@ msgstr "Auto-invio OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "Accesso OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "URL OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "Autenticazione OpenID annullata."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Autenticazione OpenID non riuscita: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Errore OpenID: %s"
@@ -1732,11 +2006,12 @@ msgid "OpenID settings"
 msgstr "Impostazioni OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Puoi aggiungere un messaggio personale agli inviti."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Caricamento parziale."
 
@@ -1746,34 +2021,46 @@ msgstr "Caricamento parziale."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Password"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "La password e la conferma non corrispondono."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "La password dev'essere lunga almeno 6 caratteri."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Richiesta password di ripristino"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Password salvata."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Le password non corrispondono."
 
@@ -1793,14 +2080,17 @@ msgid "People search"
 msgstr "Ricerca persone"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Personale"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Messaggio personale"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
 
@@ -1814,7 +2104,7 @@ msgstr ""
 "messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Annulla\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
 
@@ -1823,7 +2113,9 @@ msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -1832,42 +2124,52 @@ msgstr "Preferenze"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Lingua preferita"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Privacy"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Problema nel salvare il messaggio."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profilo"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "URL del profilo"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Impostazioni del profilo"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Profilo sconosciuto"
 
@@ -1875,19 +2177,20 @@ msgstr "Profilo sconosciuto"
 msgid "Public Stream Feed"
 msgstr "Feed del flusso pubblico"
 
-#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Attività pubblica"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Pubblica un MicroID per il mio indirizzo email"
 
@@ -1896,14 +2199,15 @@ msgstr "Pubblica un MicroID per il mio indirizzo email"
 msgid "Recent Tags"
 msgstr "Etichette recenti"
 
-# pulsante, indica un'azione quindi come gli altri: accedi, abbonati...
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Recupera"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Recupero password"
 
@@ -1916,37 +2220,45 @@ msgstr "Codice di recupero per utente sconosciuto."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registra"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Registrazione non consentita."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrazione riuscita"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Rifiuta"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Ricordami"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Profilo remoto senza profilo corrispondente"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Abbonamento remoto"
 
@@ -1960,6 +2272,9 @@ msgstr "Abbonamento remoto"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1968,7 +2283,7 @@ msgstr "Rimuovi"
 msgid "Remove OpenID"
 msgstr "Rimuovi OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1977,34 +2292,41 @@ msgstr ""
 "vuoi rimuoverlo, prima aggiungi un altro OpenID."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Risposte"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Risposte a %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Reimposta"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Reimposta password"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "Numero di telefono per SMS"
 
@@ -2013,18 +2335,18 @@ msgstr "Numero di telefono per SMS"
 msgid "SMS Settings"
 msgstr "Impostazioni SMS"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "Conferma SMS"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Stessa password di sopra"
 
-#  Femminile, è la password
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Stessa password di sopra. Richiesta."
 
@@ -2037,12 +2359,21 @@ msgstr "Stessa password di sopra. Richiesta."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Salva"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Ricerca"
 
@@ -2052,7 +2383,7 @@ msgid "Search Stream Feed"
 msgstr "Ricerca nel flusso dei feed"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2061,7 +2392,7 @@ msgstr ""
 "Ricerca tra i messaggi su %%site.name%% in base al contenuto. Separa i "
 "termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2071,33 +2402,38 @@ msgstr ""
 "i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Seleziona un operatore"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Invia"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Inviami avvisi di nuovi abbonamenti via email"
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Inviami le notifiche via Jabber/GTalk"
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2106,15 +2442,18 @@ msgstr ""
 "bollette da parte del mio operatore"
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Impostazioni"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Impostazioni salvate."
 
@@ -2134,27 +2473,32 @@ msgid "Something weird happened."
 msgstr "È successo qualcosa di strano."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Email di ricezione non consentita."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Quella non è la tua email di ricezione."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Sorgenti"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Statistiche"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "OpenID memorizzato non trovato."
 
@@ -2162,24 +2506,28 @@ msgstr "OpenID memorizzato non trovato."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Abbonati"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abbonati"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Abbonamento autorizzato"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Abbonamento rifiutato"
 
@@ -2187,28 +2535,35 @@ msgstr "Abbonamento rifiutato"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abbonamenti"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Errore di sistema nel caricare il file."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Etichette"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Testo"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Ricerca testo"
 
@@ -2228,6 +2583,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Quel codice di conferma non è per te!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Quell'indirizzo email appartiene già a un altro utente."
 
@@ -2237,66 +2593,73 @@ msgid "That file is too big."
 msgstr "Quel file è troppo grande."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Quello è già il tuo ID di Jabber."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Quello è già il tuo indirizzo email."
 
-#  previous suggestion missed the dot
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Quello è già il tuo numero di telefono."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Quello non è il tuo ID di Jabber."
 
-#  previous suggestion missed the dot
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Quello non è il tuo indirizzo email."
 
-#  previous suggestion missed the dot
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Quello non è il tuo numero di telefono."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Quello è l'indirizzo di messaggistica sbagliato."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Quello è il numero di conferma errato."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Quel numero di telefono appartiene già a un altro utente."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Troppo lungo. Lunghezza massima 140 caratteri."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Troppo lungo. Lunghezza massima 255 caratteri."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'indirizzo \"%s\" è stato confermato per il tuo account."
@@ -2305,11 +2668,14 @@ msgstr "L'indirizzo \"%s\" è stato confermato per il tuo account."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "L'indirizzo è stato rimosso."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2319,7 +2685,8 @@ msgstr ""
 "richiamo. Controlla le istruzioni del sito per i dettagli su come "
 "autorizzare l'abbonamento. Il tuo token per l'abbonamento è:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2330,34 +2697,39 @@ msgstr ""
 "rifiutare completamente l'abbonamento."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Queste sono le persone che seguono %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Queste sono le persone che ti seguono."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Queste sono le persone seguite da %s."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Queste sono le persone che stai seguendo."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Queste persone sono già utenti e sei stato automaticamente abbonato a loro:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Questo codice di conferma è scaduto. Ricomincia da capo."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2366,7 +2738,7 @@ msgstr ""
 "sul pulsante per inviarlo al tuo servizio OpenID."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2381,6 +2753,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Questo metodo richiede POST o DELETE."
 
@@ -2389,25 +2764,37 @@ msgstr "Questo metodo richiede POST o DELETE."
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Questo metodo richiede POST."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Fuso orario"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Fuso orario non selezionato"
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2420,18 +2807,21 @@ msgstr ""
 "tuo profilo qui di seguito."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Devono essere forniti due ID utente o nominativi."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL della tua pagina web, blog o profilo su un altro sito"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL del tuo profilo su un altro servizio di micro-blog compatibile"
 
@@ -2443,15 +2833,22 @@ msgstr "URL del tuo profilo su un altro servizio di micro-blog compatibile"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Invio del modulo inaspettato."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Ripristino della password inaspettato."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Azione sconosciuta"
 
@@ -2474,7 +2871,6 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr "Tipo di indirizzo non riconosciuto %s"
 
-# è un tentativo, visto che è un pulsante, mi prendo la licenza poetica...
 #: ../actions/showstream.php:209 actions/showstream.php:219
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
@@ -2483,38 +2879,47 @@ msgstr "Disabbonati"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Versione OMB non supportata"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Formato file immagine non supportato."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Aggiornamenti via SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Aggiornamenti via messaggistica istantanea (MI)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Aggiornamenti da %1$s e amici su %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aggiornamenti da %1$s su %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Carica"
 
@@ -2535,15 +2940,17 @@ msgid "Upload a new profile image"
 msgstr "Carica una nuova immagine per il profilo"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "Usa questo modulo per invitare i tuoi amici e colleghi a usare questo "
 "servizio."
 
-#  Femminile, è l'email
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Usata solo per aggiornamenti, annunci e recupero password"
 
@@ -2567,11 +2974,16 @@ msgstr "L'utente che intendi seguire non esiste."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "L'utente non ha un profilo."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Soprannome dell'utente"
 
@@ -2580,38 +2992,43 @@ msgid "User not found."
 msgstr "Utente non trovato."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "In che fuso orario risiedi solitamente?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Cosa succede %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dove ti trovi, tipo \"città, regione, stato\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo di immagine errata per \"%s\""
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Dimensione dell'immagine sbagliata a \"%s\""
 
-#  "si" is the last musical note in the "do scale". "sì" is the correct Italian translation for "yes".
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Sì"
 
@@ -2634,11 +3051,12 @@ msgid "You are already logged in!"
 msgstr "Hai già effettuato l'accesso!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Sei già abbonato a questi utenti:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "Non sei amico dell'utente specificato."
 
@@ -2656,13 +3074,14 @@ msgstr "Puoi creare un nuovo account per iniziare a inviare messaggi."
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "Puoi rimuovere un OpenID dal tuo account facendo clic su \"Rimuovi\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2672,7 +3091,8 @@ msgstr ""
 "istantanea](%%doc.im%%) Jabber/GTalk. Configura il tuo indirizzo e le "
 "impostazioni qui di seguito."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2683,21 +3103,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Puoi usare l'abbonamento locale!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Non puoi registrarti se non accetti la licenza."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Non hai inviato quel profilo"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2719,16 +3141,19 @@ msgstr ""
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Non puoi eliminare lo stato di un altro utente."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2736,22 +3161,22 @@ msgstr ""
 "Riceverai una notifica quando i tuoi invitati accetteranno e si "
 "registreranno sul sito. Grazie per l'aiuto ad accrescere la comunità!"
 
-# per la par condicio ho sostituito 'sei stato identificato'
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Sei ora identificato/a. Inserisci una nuova password qui di seguito. "
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "Il tuo URL OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Il tuo soprannome su questo server o il tuo indirizzo email registrato."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2760,47 +3185,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) ti permette di accedere a molti siti con lo stesso "
 "account. Gestisci i tuoi OpenID associati da qui."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "pochi secondi fa"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "circa %d giorni fa"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "circa %d ore fa"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "circa %d minuti fa"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "circa %d mesi fa"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "circa un giorno fa"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "circa un minuto fa"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "circa un mese fa"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "circa un anno fa"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "circa un'ora fa"
 
@@ -2822,13 +3257,14 @@ msgid "reply"
 msgstr "rispondi"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "stessa password di sopra"
 
-#  wrong capitalization in previous suggestion
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "tipo di file non supportato"
 
@@ -2849,6 +3285,26 @@ msgstr "« Successivi"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo."
 
@@ -2857,6 +3313,7 @@ msgid "This notice is not a favorite!"
 msgstr "Questo messaggio non è un preferito!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Impossibile eliminare un preferito."
 
@@ -2864,23 +3321,29 @@ msgstr "Impossibile eliminare un preferito."
 msgid "Favor"
 msgstr "Preferito"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti"
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Questo messaggio è già un preferito!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Impossibile creare preferito."
 
@@ -2890,11 +3353,13 @@ msgstr "Non preferito"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "Messaggi preferiti di %s"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Feed dei messaggi preferiti di %s"
@@ -2938,33 +3403,44 @@ msgid "Login with your username and password. "
 msgstr "Accedi con il tuo nome utente e password. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Nessun destinatario specificato."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Non puoi inviare un messaggio a questo utente."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "Nessun tale utente"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nuovo messaggio"
 
@@ -3020,6 +3496,11 @@ msgstr "Qui puoi aggiornare il tuo profilo personale "
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Utente senza profilo corrispondente"
 
@@ -3048,6 +3529,8 @@ msgid "New password successfully saved. "
 msgstr "Nuova password salvata con successo. "
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "La password deve essere di 6 o più caratteri."
 
@@ -3069,12 +3552,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "Per abbonarti, puoi [eseguire l'accesso](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Feed dei preferiti di %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Impossibile recuperare i messaggi preferiti."
 
@@ -3082,7 +3568,7 @@ msgstr "Impossibile recuperare i messaggi preferiti."
 msgid "No such message."
 msgstr "Nessun tale messaggio."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Solo mittente e destinatario possono leggere questo messaggio."
 
@@ -3106,51 +3592,70 @@ msgid "Mobile carrier for your phone. "
 msgstr "Operatore mobile del tuo telefono. "
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Messaggi diretti a %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Tutti i messaggi diretti inviati a %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Messaggi diretti inviati"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Tutti i messaggi diretti inviati da %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Nessun testo nel messaggio!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Utente destinatario non trovato."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Non puoi inviare messaggi diretti a utenti che non sono amici tuoi."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Preferiti da %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s aggiornamenti preferiti da %s / %s"
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s ha aggiunto il tuo messaggio tra i suoi preferiti"
@@ -3173,14 +3678,17 @@ msgstr ""
 "su Twitter, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Impostazioni Twitter"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Account Twitter"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Account Twitter attualmente verificato."
 
@@ -3189,6 +3697,7 @@ msgid "Twitter Username"
 msgstr "Nome utente di Twitter"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Niente spazi, grazie."
 
@@ -3197,18 +3706,22 @@ msgid "Twitter Password"
 msgstr "Password di Twitter"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Invia automaticamente i miei messaggi a Twitter"
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Invia le risposte \"@\" locali a Twitter"
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Abbonami ai miei amici di Twitter"
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3217,6 +3730,7 @@ msgstr ""
 "trattini bassi (_) (max 15 caratteri)."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "Impossibile verificare le tue credenziali di Twitter!"
 
@@ -3227,33 +3741,43 @@ msgstr "Impossibile ottenere informazioni sull'account \"%s\" da Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "Impossibile salvare le tue impostazioni di Twitter!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Impostazioni di Twitter salvate."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Quello non è il tuo account Twitter."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "Impossibile rimuovere l'utente Twitter."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Account Twitter rimosso."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "Impossibile salvare le preferenze di Twitter."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Preferenze di Twitter salvate."
 
@@ -3270,18 +3794,19 @@ msgid "The subscription has been rejected, but no "
 msgstr "L'abbonamento è stato rifiutato, ma non "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Risultati comando"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Comando completato"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Comando non riuscito"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Questo comando non è ancora implementato"
 
@@ -3291,89 +3816,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "Abbonamenti: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "L'utente non ha un ultimo messaggio"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Messaggio indicato come preferito."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Ubicazione: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina web: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Informazioni: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Messaggio diretto a %s inviato"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Errore nell'inviare il messaggio diretto."
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Specifica il nome dell'utente a cui abbonarti"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Abbonato a %s"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Abbonamento a %s annullato"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Comando non ancora implementato."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Notifiche disattivate."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "Impossibile disattivare le notifiche."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Notifiche attivate."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Impossibile attivare le notifiche."
 
@@ -3381,11 +3928,11 @@ msgstr "Impossibile attivare le notifiche."
 msgid "Commands:\n"
 msgstr "Comandi:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "Impossibile inserire messaggio."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
 
@@ -3402,7 +3949,7 @@ msgstr ""
 "Hai un nuovo indirizzo di ricezione su %1$s.\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "Nuovo messaggio privato da %s"
@@ -3416,7 +3963,7 @@ msgstr ""
 "%1$s (%2$s) ti ha inviato un messaggio privato:\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "Solo l'utente può leggere la propria casella di posta."
 
@@ -3425,31 +3972,39 @@ msgid "This form should automatically submit itself. "
 msgstr "Questo modulo dovrebbe inviarsi automaticamente. "
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Preferiti"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Messaggi preferiti di %s"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Utente"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "In arrivo"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "I tuoi messaggi in arrivo"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Inviati"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "I tuoi messaggi inviati"
 
@@ -3462,14 +4017,19 @@ msgid "Twitter integration options"
 msgstr "Opzioni di integrazione Twitter"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "A"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "Impossibile analizzare il messaggio."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s e amici, pagina %d"
@@ -3479,21 +4039,31 @@ msgid "You can upload your personal avatar."
 msgstr "Qui puoi caricare la tua immagine personale."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Impostazioni immagine"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Originale"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Anteprima"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Ritaglia"
 
@@ -3510,35 +4080,43 @@ msgid "There was a problem with your session token. "
 msgstr "C'è stato un problema con il tuo token di sessione. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Scegli un'area quadrata per la tua immagine personale"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Perso il nostro file di dati."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "Perso il nostro file."
 
-#  wrong capitalization in previous suggestion
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "Tipo di file sconosciuto"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "Nessun profilo specificato."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "Nessun profilo con quel ID."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Blocca utente"
 
@@ -3546,11 +4124,11 @@ msgstr "Blocca utente"
 msgid "Are you sure you want to block this user? "
 msgstr "Vuoi veramente bloccare questo utente? "
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Hai già bloccato questo utente."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "Salvataggio delle informazioni per il blocco non riuscito."
 
@@ -3567,38 +4145,56 @@ msgstr "Stai per eliminare definitivamente un messaggio. "
 msgid "Add to favorites"
 msgstr "Aggiungi ai preferiti"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Modifica il gruppo %s"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr "La casella della posta in arrivo deve essere abilitata per funzionare"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Devi eseguire l'accesso per creare un gruppo."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "Nessun soprannome"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "Nessun tale gruppo"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Devi essere amministratore per modificare il gruppo"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Usa questo modulo per modificare il gruppo."
 
@@ -3607,14 +4203,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr "Il soprannome deve essere composto solo da lettere minuscole "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "La descrizione è troppo lunga (max 140 caratteri)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "Impossibile aggiornare il gruppo."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "Opzioni salvate."
 
@@ -3631,8 +4228,8 @@ msgstr "Crea un nuovo indirizzo email per inviare messaggi; "
 msgid "Send me email when someone "
 msgstr "Inviami un'email quando qualcuno "
 
-# per non usare una traduzione troppo fedele e forse un po' banale (gomitata, spintarella), facciamo come abbiamo fatto con Pidgin in Ubuntu, trasformando 'nudge' in un richiamo, anche perché è quello che realmente fa.
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Consenti ai miei amici di richiamarmi e inviami un'email"
 
@@ -3646,13 +4243,12 @@ msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
 "Un codice di conferma è stato inviato all'indirizzo email che hai aggiunto. "
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "Errore del server: impossibile recuperare l'utente."
 
 #: actions/facebookhome.php:196
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "If you would like the %s app to automatically update "
 msgstr "Se vuoi che l'applicazione %s aggiorni automaticamente "
 
@@ -3661,51 +4257,66 @@ msgstr "Se vuoi che l'applicazione %s aggiorni automaticamente "
 msgid "Allow %s to update my Facebook status"
 msgstr "Consenti a %s di aggiornare il mio stato su Facebook"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Salta"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr "Nessun contenuto!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Paginazione"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "Successivi"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "Precedenti"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Grazie per aver invitato i tuoi amici a usare %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "Gli inviti sono stati inviati ai seguenti utenti:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "Hai un invito per %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr "Invita i tuoi amici a usare %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Amici che già usano %s:"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Invia"
@@ -3740,8 +4351,7 @@ msgid "A string to prefix notices with."
 msgstr "Una stringa con cui iniziare i messaggi."
 
 #: actions/facebooksettings.php:124
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "If you would like %s to automatically update "
 msgstr "Se vuoi che %s aggiorni automaticamente "
 
@@ -3749,18 +4359,17 @@ msgstr "Se vuoi che %s aggiorni automaticamente "
 msgid "Sync preferences"
 msgstr "Preferenze di sincronizzazione"
 
-# da chiarire dove e come appaia
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Rimuovi preferito"
 
-# prova per 'famosi', al massimo si cambia
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Messaggi famosi"
 
-# prova per 'famosi', al massimo si cambia
 #: actions/favorited.php:67
 #, php-format
 msgid "Popular notices, page %d"
@@ -3771,7 +4380,8 @@ msgid "The most popular notices on the site right now."
 msgstr "Ecco i messaggi più famosi all'interno del sito."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Utenti in evidenza"
 
@@ -3785,15 +4395,17 @@ msgstr "Utenti in evidenza, pagina %d"
 msgid "A selection of some of the great users on %s"
 msgstr "Una selezione dei migliori utenti su %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Quell'utente ti ha bloccato dall'abbonarti."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "Nessun ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Logo del gruppo"
 
@@ -3801,11 +4413,13 @@ msgstr "Logo del gruppo"
 msgid "You can upload a logo image for your group."
 msgstr "Puoi caricare un'immagine per il logo del tuo gruppo."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Logo aggiornato."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "Errore nell'aggiornare il logo."
 
@@ -3824,7 +4438,8 @@ msgid "A list of the users in this group."
 msgstr "Un elenco degli utenti in questo gruppo."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Gruppi"
 
@@ -3834,12 +4449,12 @@ msgid "Groups, page %d"
 msgstr "Gruppi, pagina %d"
 
 #: actions/groups.php:90
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "I gruppi di %%%%site.name%%%% ti consentono di cercare e parlare con "
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "Crea un nuovo gruppo"
 
@@ -3849,7 +4464,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr "Ricerca gruppi su %%site.name%% per nome, ubicazione o descrizione. "
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Ricerca gruppi"
 
@@ -3859,8 +4474,7 @@ msgid "You can send and receive notices through "
 msgstr "Puoi inviare e ricevere messaggi attraverso "
 
 #: actions/imsettings.php:120
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "Jabber or GTalk address, "
 msgstr "Indirizzo Jabber o GTalk, "
 
@@ -3873,20 +4487,20 @@ msgstr "Inviami le risposte via Jabber/GTalk "
 msgid "A confirmation code was sent "
 msgstr "Un codice di conferma è stato inviato "
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "Sei già un membro di quel gruppo"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Impossibile iscrivere l'utente %s al gruppo %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s si è iscritto al gruppo %s"
@@ -3897,15 +4511,18 @@ msgstr ""
 "Le caselle di posta in arrivo devono essere abilitate per i gruppi per poter "
 "funzionare."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Devi eseguire l'accesso per lasciare un gruppo."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "Nessuna tale gruppo."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "Non sei un membro di quel gruppo."
 
@@ -3913,21 +4530,25 @@ msgstr "Non sei un membro di quel gruppo."
 msgid "You may not leave a group while you are its administrator."
 msgstr "Non puoi lasciare un gruppo fintantoché ne sei amministratore."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr "Impossibile trovare il record della membership."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Impossibile rimuovere l'utente %s dal gruppo %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s ha lasciato il gruppo %s"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "Accedi al sito"
 
@@ -3939,15 +4560,17 @@ msgstr "Nessuno stato corrente"
 msgid "New group"
 msgstr "Nuovo gruppo"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "Usa questo modulo per creare un nuovo gruppo."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "Impossibile creare il gruppo."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr "Impossibile impostare la membership al gruppo."
 
@@ -3959,11 +4582,14 @@ msgstr "È troppo lungo. "
 msgid "Don't send a message to yourself; "
 msgstr "Non inviare un messaggio a te stesso; "
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "Messaggio inviato"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Errore di Ajax"
 
@@ -3982,7 +4608,7 @@ msgstr "Richiamo inviato"
 msgid "Nudge sent!"
 msgstr "Richiamo inviato!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr "Accesso OpenID"
 
@@ -3999,7 +4625,6 @@ msgstr "Altre impostazioni"
 msgid "Manage various other options."
 msgstr "Gestisci altre opzioni."
 
-# o andare con un 'accorciamento'? auto-accorciamento?
 #: actions/othersettings.php:93
 msgid "URL Auto-shortening"
 msgstr "Autoriduzione degli URL"
@@ -4008,13 +4633,13 @@ msgstr "Autoriduzione degli URL"
 msgid "Service"
 msgstr "Servizio"
 
-# o andare con 'accorciamento'? auto-accorciamento?
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Servizio di autoriduzione da usare."
 
-# in caso, accorciamento anche qui.
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)"
 
@@ -4022,16 +4647,17 @@ msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)"
 msgid "Change your password."
 msgstr "Modifica la tua password."
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr "Cambio password"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Non è un'etichetta valida di persona: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Utenti auto-etichettati con %s - pagina %d"
@@ -4041,11 +4667,12 @@ msgstr "Utenti auto-etichettati con %s - pagina %d"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Questi sono gli utenti che si sono etichettati con \"%s\" "
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informazioni sul profilo"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4057,21 +4684,25 @@ msgid "Automatically subscribe to whoever "
 msgstr "Abbonami automaticamente a chi "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Etichetta non valida: \"%s\""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "Impossibile salvare le etichette."
 
-#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Attività pubblica, pagina %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Impossibile recuperare l'attività pubblica."
 
@@ -4081,24 +4712,25 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"Questo è %%site.name%%, un servizio di [micro-"
-"blog](http://it.wikipedia.org/wiki/Microblogging) "
+"Questo è %%site.name%%, un servizio di [micro-blog](http://it.wikipedia.org/"
+"wiki/Microblogging) "
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Insieme delle etichette"
 
 #: actions/publictagcloud.php:63
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "These are most popular recent tags on %s "
 msgstr "Queste sono le etichette più usate e recenti su %s "
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "Insieme etichette"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Spiacenti, solo le persone invitate possono registrarsi."
 
@@ -4117,7 +4749,6 @@ msgstr "Tramite questo modulo puoi creare "
 msgid "1-64 lowercase letters or numbers, "
 msgstr "1-64 lettere minuscole o numeri, "
 
-#  Femminile, è l'email
 #: actions/register.php:382 actions/register.php:386
 #, fuzzy
 msgid "Used only for updates, announcements, "
@@ -4128,7 +4759,6 @@ msgstr "Usata solo per aggiornamenti, annunci "
 msgid "URL of your homepage, blog, "
 msgstr "URL della tua pagina web, blog "
 
-# per renderla 'asessuale' il più possibile...
 #: actions/register.php:404
 #, fuzzy
 msgid "Describe yourself and your "
@@ -4158,7 +4788,8 @@ msgstr "(Dovresti ricevere un messaggio email "
 msgid "That's a local profile! Login to subscribe."
 msgstr "Quello è un profilo locale! Accedi per abbonarti."
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Risposte a %s, pagina %d"
@@ -4168,51 +4799,71 @@ msgstr "Risposte a %s, pagina %d"
 msgid "%s favorite notices, page %d"
 msgstr "Messaggi preferiti di %s, pagina %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Gruppi di %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Gruppi di %s, pagina %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Profilo del gruppo"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr "Nota"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Azioni dei gruppi"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr "Feed dei messaggi per il gruppo %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Membri"
 
-# femminile, è relativo alle etichette
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(nessuno)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "Tutti i membri"
 
@@ -4222,15 +4873,15 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** è un gruppo su %%%%site.name%%%%, un servizio di [micro-"
-"blog](http://it.wikipedia.org/wiki/Microblogging) "
+"**%s** è un gruppo su %%%%site.name%%%%, un servizio di [micro-blog](http://"
+"it.wikipedia.org/wiki/Microblogging) "
 
 #: actions/showmessage.php:98
 #, fuzzy
 msgid "Only the sender and recipient "
 msgstr "Solo mittente e destinatario "
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, pagina %d"
@@ -4241,30 +4892,37 @@ msgid "'s profile"
 msgstr "Profilo"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "Profilo utente"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Fotografia"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "Azioni utente"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "Invia un messaggio diretto a questo utente"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Messaggio"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "Tutti gli abbonati"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "Tutti i gruppi"
 
@@ -4274,8 +4932,8 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** ha un account su %%%%site.name%%%%, un servizio di [micro-"
-"blog](http://it.wikipedia.org/wiki/Microblogging) "
+"**%s** ha un account su %%%%site.name%%%%, un servizio di [micro-blog]"
+"(http://it.wikipedia.org/wiki/Microblogging) "
 
 #: actions/smssettings.php:128
 #, fuzzy
@@ -4291,7 +4949,7 @@ msgstr "Inviami le notifiche via SMS; "
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Un codice di conferma è stato inviato al numero di telefono aggiunto. "
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Operatore telefonico"
 
@@ -4351,16 +5009,17 @@ msgstr "Queste sono le persone i cui messaggi "
 msgid "These are the people whose "
 msgstr "Queste sono le persone i cui "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Messaggi etichettati con %s, pagina %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "Messaggi etichettati con \"%s\", i più recenti"
@@ -4382,7 +5041,7 @@ msgstr "Etichetta %s"
 msgid "Tag user"
 msgstr "Etichette utente"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4394,17 +5053,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "C'è stato un problema con il tuo token di sessione."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Puoi etichettare sole le persone a cui sei abbonato o che sono abbonate a te."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Impossibile salvare le etichette."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Usa questo modulo per aggiungere etichette ai tuoi abbonati o ai tuoi "
@@ -4414,20 +5073,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "Nessuna tale etichetta."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "Micro-blog etichettati con %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Blocco dell'utente non riuscito."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "Sblocco dell'utente non riuscito."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Non trovato"
 
@@ -4436,16 +5098,16 @@ msgstr "Non trovato"
 msgid "Add your Twitter account to automatically send "
 msgstr "Aggiungi il tuo account Twitter per inviare automaticamente "
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Nome utente di Twitter"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Password di Twitter"
 
-# elenca quali sono i propri amici su twitter
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Amici su Twitter"
 
@@ -4459,150 +5121,157 @@ msgstr "Il nome utente deve avere solo numeri, "
 msgid "Unable to retrieve account information "
 msgstr "Impossibile recuperare informazioni sull'account "
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "Errore nel rimuovere il blocco."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "Nessun ID di profilo nella richiesta."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "Nessun profilo con quel ID."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Annullato abbonamento"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "Gruppi di %s"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Gruppi di %s, pagina %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra "
 "qualche minuto."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Ti è proibito inviare messaggi su questo sito."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Carica un'immagine"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Altro"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Altre opzioni"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Pagina senza nome"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Esplorazione sito primaria"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Profilo personale e attività degli amici"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Ricerca persone o per testo"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Account"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Modifica la tua email, immagine, password o il tuo profilo"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Connettiti con MI, SMS e Twitter"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Sconnettiti dal sito"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Accedi al sito"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Crea un account"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "Accedi con OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "Aiutami!"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr "Messaggio del sito"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "Viste locali"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr "Pagina messaggio"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Esplorazione secondaria del sito"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Licenza del software statusnet"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "Tutto "
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "licenza."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "Blocca questo utente"
 
-# azione
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Blocca"
 
-# è un suggerimento
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Togli questo messaggio dai preferiti"
@@ -4613,12 +5282,15 @@ msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 "Per utilizzare l'applicazione Facebook %s è necessario eseguire l'accesso "
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr " un nuovo account."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "Pubblicato"
 
@@ -4638,32 +5310,36 @@ msgstr "Filtra etichette"
 msgid "All"
 msgstr "Tutto"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Etichetta"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Scegli un'etichetta per ridurre l'elenco"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Vai"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL della pagina web o del blog per il gruppo o l'argomento"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Descrizione"
 
-# per renderla 'asessuale' il più possibile...
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Descrivi il gruppo o l'argomento in 140 caratteri"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\""
@@ -4672,21 +5348,20 @@ msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\""
 msgid "Group"
 msgstr "Gruppo"
 
-# potrebbe essere lunga...
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "Amministra"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Modifica le proprietà del gruppo %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Aggiungi o modifica il logo di %s"
@@ -4709,7 +5384,6 @@ msgstr "Etichette nei messaggi del gruppo %s"
 msgid "This page is not available in a "
 msgstr "Questa pagina non è disponibile in un "
 
-# è relativo ai gruppi
 #: lib/joinform.php:114
 msgid "Join"
 msgstr "Iscriviti"
@@ -4718,11 +5392,11 @@ msgstr "Iscriviti"
 msgid "Leave"
 msgstr "Lascia"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Accedi con nome utente e password"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Iscriviti per un nuovo account"
 
@@ -4744,17 +5418,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s sta ora seguendo "
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Ubicazione: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Pagina web: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4763,7 +5437,7 @@ msgstr ""
 "Biografia: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s ti ha richiamato"
@@ -4778,40 +5452,47 @@ msgstr "%1$s (%2$s) si chiede cosa tu "
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s ha appena aggiunto il tuo messaggio da %2$s"
 
-# è quello che si vede come descrizione da dove si è inviato il messaggio. Mettere 'da' non suona bene ('da web', 'da api'...), 'via' mi pare la soluzione migliore ('via web', 'via api', 'via Twhirl'...).
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "Da"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Invia un messaggio diretto"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "Invia un messaggio"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Caratteri disponibili"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "in risposta a"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Rispondi a questo messaggio"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Rispondi"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Elimina questo messaggio"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Elimina"
 
@@ -4832,29 +5513,29 @@ msgstr "Invia un richiamo a questo utente"
 msgid "Tags in %s's notices"
 msgstr "Etichette nei messaggi di %s"
 
-# femminile, è relativo alle etichette
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(nessuna)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Pubblico"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Gruppi dell'utente"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etichette recenti"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "In evidenza"
 
-# è una prova, è il nome di una scheda, al massimo si cambia, però popolari mi pare troppo banale.
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Famosi"
 
@@ -4870,31 +5551,33 @@ msgstr "Ricerca gruppi in questo sito"
 msgid "Untitled section"
 msgstr "Sezione senza nome"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Persone a cui %s è abbonato"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Persone abbonate a %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Il gruppo %s è membro di"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita amici e colleghi a seguirti su %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "L'utente ti ha bloccato."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Abbonati a questo utente"
 
@@ -4907,11 +5590,11 @@ msgid "Top posters"
 msgstr "Chi scrive più messaggi"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Sblocca questo utente"
 
-# azione
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Sblocca"
 
@@ -4919,57 +5602,2063 @@ msgstr "Sblocca"
 msgid "Unsubscribe from this user"
 msgstr "Annulla l'abbonamento da questo utente"
 
-#~ msgid "Code not yet ready."
-#~ msgstr "Codice non ancora implementato."
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed per gli amici di %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed per gli amici di %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed per gli amici di %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s e amici"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Qui puoi caricare la tua immagine personale."
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Immagine aggiornata."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Stai per eliminare definitivamente un messaggio. Una volta fatto non sarà "
+"possibile recuperarlo."
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Puoi caricare un'immagine per il logo del tuo gruppo."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Scegli un'area quadrata per la tua immagine personale"
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Micro-blog di %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Ricerca le persone su %%site.name%% per nome, ubicazione o interessi. Separa "
+"i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Errore nell'inviare il messaggio diretto."
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Ricerca \"%s\" nel flusso"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Per motivi di sicurezza è necessario reinserire il proprio nome utente e la "
+"propria password prima di modificare le impostazioni."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Feed del flusso pubblico"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Feed del flusso pubblico"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Feed del flusso pubblico"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" a eccezione di questi dati personali: password, indirizzo email, indirizzo "
+"messaggistica istantanea, numero di telefono."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Crea"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Profilo del gruppo"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "Profilo"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Casella posta inviata di %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Immagine"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Impostazioni del profilo"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Un codice di conferma è stato inviato al numero di telefono che hai "
+"aggiunto. Controlla la tua casella di posta (e anche la posta indesiderata!) "
+"per il codice e le istruzioni su come usarlo."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Nessun tale utente"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Aggiungi il tuo account Twitter per inviare automaticamente i tuoi messaggi "
+"su Twitter, "
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Impossibile ottenere informazioni sull'account \"%s\" da Twitter."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai "
+"messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Annulla\"."
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Ricerca persone o per testo"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra "
+"qualche minuto."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Connettiti con MI, SMS e Twitter"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Richiama"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"Per utilizzare l'applicazione Facebook %s è necessario eseguire l'accesso "
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s sta ora seguendo i tuoi messaggi su %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Cordiali saluti,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Ricerca"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Nessun tale documento."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Un elenco degli utenti in questo gruppo."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Un elenco degli utenti in questo gruppo."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Profilo utente"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s e amici, pagina %d"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Un elenco degli utenti in questo gruppo."
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Sblocco dell'utente non riuscito."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Codice di conferma"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Impossibile eliminare questo messaggio."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Etichetta non valida: \"%s\""
 
-#~ msgid "Export and delete your user information."
-#~ msgstr "Esporta ed elimina le tue informazioni personali."
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Soprannome già in uso. Prova con un altro."
 
-#~ msgid "Delete my account"
-#~ msgstr "Elimina il mio account"
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Conferma l'eliminazione dell'account"
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Impossibile creare preferito."
 
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Seleziona per eliminare veramente il tuo account."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-# messa così perché è una descrizione della pagina, compare in alto
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Ecco i messaggi più famosi"
+#: 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 ""
 
-#~ msgid "Tag a person"
-#~ msgstr "Etichetta una persona"
+#: 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 ""
 
-#~ msgid "List"
-#~ msgstr "Elenco"
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nuovo messaggio"
 
-#~ msgid "Icons"
-#~ msgstr "Icone"
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nuovo messaggio"
 
-#~ msgid ""
-#~ "Hey, %s.\n"
-#~ "\n"
-#~ "Someone just entered this email address on %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ehi %s.\n"
-#~ "\n"
-#~ "Qualcuno ha appena inserito questo indirizzo email in %s.\n"
-#~ "\n"
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Impossibile confermare l'email."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#~ msgid "Email address"
-#~ msgstr "Indirizzo email"
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Non è un soprannome valido."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Nessun profilo specificato."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "L'utente ti ha bloccato."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Non sei un membro di quel gruppo."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Blocca utente"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Devi eseguire l'accesso per creare un gruppo."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Gruppi"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Impossibile aggiornare l'utente."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Impossibile salvare le tue impostazioni di Twitter!"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Errore nell'inserire un messaggio"
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Preferenze di sincronizzazione salvate."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Devi essere amministratore per modificare il gruppo"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Amministra"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Nessun risultato"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "L'utente ti ha bloccato."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Messaggio"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Impossibile salvare il profilo."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) ti permette di accedere a molti siti con lo stesso "
+"account. Gestisci i tuoi OpenID associati da qui."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Impostazioni del profilo"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"Questo è %%site.name%%, un servizio di [micro-blog](http://it.wikipedia.org/"
+"wiki/Microblogging) "
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Se hai dimenticato o perso la tua password, puoi fartene inviare una nuova "
+"per email all'indirizzo indicato nel tuo profilo."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Sei ora identificato/a. Inserisci una nuova password qui di seguito. "
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Richiesta password di ripristino"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Errore con il codice di conferma."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Abbonati a questo utente"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "Se hai dimenticato o perso la tua password, puoi riceverne una nuova "
-#~ "all'indirizzo email memorizzato nel tuo account."
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Messaggi preferiti di %s, pagina %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Feed dei messaggi per il gruppo %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Feed dei messaggi per il gruppo %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Feed dei messaggi per il gruppo %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"**%s** è un gruppo su %%%%site.name%%%%, un servizio di [micro-blog](http://"
+"it.wikipedia.org/wiki/Microblogging) "
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Amministra"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Non un utente locale."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Messaggi etichettati con %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Feed dei messaggi per il gruppo %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"**%s** ha un account su %%%%site.name%%%%, un servizio di [micro-blog]"
+"(http://it.wikipedia.org/wiki/Microblogging) "
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s sta ora seguendo "
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Questo messaggio è già un preferito!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Questo messaggio non è un preferito!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Impossibile recuperare l'attività pubblica."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "Nessun destinatario specificato."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Impossibile trovare un qualsiasi stato."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Aggiornamenti in risposta a %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Aggiornamenti da %1$s su %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "licenza."
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Abbonamenti di %s"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Impostazioni del profilo"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Non sei un membro di quel gruppo."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problema nel salvare il messaggio."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Messaggio a %1$s su %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Profilo utente"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profilo"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Carica"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Modifica la tua password"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Connetti"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Ricerca"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Elenco"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Blocca"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Blocca utente"
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Aggiungi o modifica il logo di %s"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Nessun contenuto!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Utente"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Ricerca"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "L'URL della pagina web non è valido."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Nessuna tale etichetta."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Messaggi diretti a %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Impossibile seguire l'utente: utente non trovato."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "La descrizione è troppo lunga (max 140 caratteri)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Sei già un membro di quel gruppo"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Impossibile iscrivere l'utente %s al gruppo %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Non sei un membro di quel gruppo."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Impossibile rimuovere l'utente %s dal gruppo %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Gruppi di %s"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Il gruppo %s è membro di"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Azioni dei gruppi"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Immagine aggiornata."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Troppo lungo. Lunghezza massima 140 caratteri."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Formato file immagine non supportato."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Fotografia"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "La descrizione è troppo lunga (max 140 caratteri)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Aggiornamenti da %1$s su %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "L'utente che intendi seguire non esiste."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Non autorizzato."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr ""
+"Impossibile convertire le credenziali di richiesta in credenziali di accesso."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Versione del protocollo OMB sconosciuta."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Nessun tale messaggio."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Perso il nostro file."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Aggiornamenti da %1$s su %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Questa pagina non è disponibile in un "
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Accedi con nome utente e password. Non hai ancora un nome utente? [Registra]"
+"(%%action.register%%) un nuovo account o prova [OpenID](%%action.openidlogin%"
+"%). "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Aggiornamenti da %1$s su %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Tutti gli aggiornamenti corrispondenti al termine di ricerca \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Connetti"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Descriviti assieme ai tuoi interessi in 140 caratteri"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Descrivi te e i tuoi "
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "La biografia è troppo lunga (max 140 caratteri)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Non è un URL di profilo valido (nessun documento YADIS)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Quello è un profilo locale! Accedi per abbonarti."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Impossibile ottenere un token di richiesta."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Messaggio a %1$s su %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed per gli amici di %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed per gli amici di %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed per gli amici di %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Casella posta inviata di %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Messaggio inviato"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Questa pagina non è disponibile in un "
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai "
+"messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Annulla\"."
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"L'abbonamento è stato autorizzato, ma non è stato passato alcun URL di "
+"richiamo. Controlla le istruzioni del sito per i dettagli su come "
+"autorizzare l'abbonamento. Il tuo token per l'abbonamento è:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"L'abbonamento è stato rifiutato, ma non è stato passato alcun URL di "
+"richiamo. Controlla con le istruzioni del sito per i dettagli su come "
+"rifiutare completamente l'abbonamento."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Impossibile leggere l'URL \"%s\" dell'immagine"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Tipo di immagine errata per \"%s\""
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Impossibile redirigere al server: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Licenza del software statusnet"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Impossibile aggiornare l'utente con l'indirizzo email confermato."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Richiamo inviato"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Rispondi a questo messaggio"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problema nel salvare il messaggio."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Nessun codice di conferma."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Accedi al sito"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Seleziona un operatore"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Descrivi il gruppo o l'argomento in 140 caratteri"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Descrivi il gruppo o l'argomento in 140 caratteri"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Nuovo messaggio"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s ha aggiunto il tuo messaggio tra i suoi preferiti"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " via "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Impossibile recuperare l'attività pubblica."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Elimina messaggio"
diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo
index 7026035cc..1a0ee8c34 100644
--- a/locale/ja/LC_MESSAGES/statusnet.mo
+++ b/locale/ja/LC_MESSAGES/statusnet.mo
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index bb7d777ba..3a30a60c6 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -1,58 +1,54 @@
-# #-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Toshiya TSURU <turutosiya@gmail.com>, 2008
-#
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Japanese
 #
+# Author@translatewiki.net: Fryed-peach
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-05-19 00:01+0000\n"
-"Last-Translator: Roberto A Tsuchiya <beto.tsuchiya@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:55+0000\n"
+"Language-Team: Japanese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ja\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr "\"%s\" �ストリームを検索"
+msgstr "ストリーム�ら「%s�を検索"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
-msgstr "個人情報を除�:パスワード�メールアドレス�IMアドレス�電話番�"
+msgstr "次�個人情報を除�: パスワード�メールアドレス�IMアドレス�電話番�"
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+#, fuzzy
 msgid " from "
-msgstr "�ら"
+msgstr "�ら "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s ����を %2$s �招待����"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -82,11 +78,38 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
+"%1$s ����を %2$s �招待���� (%3$s)。\n"
+"\n"
+"%2$s �����知り��や����興味をも���る人物�最新�情報を得る���"
+"��る�マイクロブログサービス��。\n"
+"\n"
+"�������最新�情報や����考���る���生活を�������を知�"
+"��る人�共有�る�������。������興味をも�人々�出会�目的�も"
+"優れ�サービス��。\n"
+"\n"
+"%1$s �言葉:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%2$s ���る %1$s �プロフィールページを以下�見る�������:\n"
+"\n"
+"%5$s\n"
+"\n"
+"��サービスを試�����場��以下�リンクをクリック����招待�応���"
+"���。\n"
+"\n"
+"%6$s\n"
+"\n"
+"�����場����メッセージを無視�る�������。�時間を�����り"
+"���������。\n"
+"\n"
+"%2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s � %2$s �����通知を������。"
+msgstr "%1$s � %2$s �����通知を購読�����。"
 
 #: ../lib/mail.php:126
 #, php-format
@@ -98,139 +121,170 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"%1$s � %2$s �����通知を������。\n"
+"%1$s � %2$s �����通知を購読�����。\n"
 "\n"
-"\t%3$s\n"
+"%3$s\n"
 "\n"
-"確������,\n"
-"%4$s.\n"
+"%4$s\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr "%1$ �ステータス %2$s"
+msgstr "%2$s ���る %1$ �状態"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
-msgstr "%s パブリックストリーム"
+msgstr "%s �公開ストリーム"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
 #: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
-msgstr "%s & �も��"
+msgstr "%s ��人"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
-msgstr "%s パブリックタイムライン"
+msgstr "%s �公開タイムライン"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
-msgstr "%s ステータス"
+msgstr "%s �状態"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
-msgstr "%s タイムライン"
+msgstr "%s �タイムライン"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
+"(メールアドレスを確��る方法を読ん�����メール�よるメッセージを���る"
+"よ��������)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
 "**%%site.name%%** � [%%site.broughtby%%](%%site.broughtbyurl%%) ��供�るマ"
-"イクロブロギングサービス��。 "
+"イクロブログサービス��。 "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** �マイクロブロギングサービス��。"
+msgstr "**%%site.name%%** �マイクロブログサービス��。 "
 
 #: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
-msgstr "コントリビューター�ニック�ーム�フル�ーム�記載�れ����。"
+msgstr "投稿者�ニック�ーム�フル�ーム�記載�れ��。"
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1～64字以内���文字アルファベット�数字�スペース。（�読点を除�）"
+msgstr "1-64文字���文字アルファベット�数字��スペースや�読点�除�"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1～64字以内���文字アルファベット�数字�スペース（�読点を除�）�必須��"
+msgstr ""
+"1-64文字���文字アルファベット�数字��スペースや�読点�除�。必須��。"
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6文字以上"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
-msgstr "6文字以上。�忘れ���"
+msgstr "6文字以上。忘れ��������"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
-msgstr "6文字以上�必須��。"
+msgstr "6文字以上。必須��。"
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
-"確�用コードを入力�れ�IMアドレス��信����。メッセージを確��る���%"
-"sを承���下��。"
+"確�用コードを入力�れ� IM アドレス��信����。����メッセージを�れ"
+"るよ���る��%sを承�������。"
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
+"確�用コードを入力�れ�電�メールアドレス��信����。�信ボックス（�ス"
+"パムボックス）�コード��れを��使������指示�届������確���"
+"����。"
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your inbox "
 "(and spam box!) for the code and instructions on how to use it."
 msgstr ""
+"確�用コードを入力�れ�電話番���信����。�信ボックス（�スパムボック"
+"ス）�コード��れを��使������指示�届������確�������。"
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -250,9 +304,36 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
-msgstr ""
+msgstr "API メソッド�見��り��ん�"
 
 #: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
 #: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -273,16 +354,23 @@ msgstr ""
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
-msgstr ""
+msgstr "API メソッド�工事中��。"
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
-msgstr "About"
+msgstr "解説"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "承�"
 
@@ -293,137 +381,159 @@ msgstr "承�"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "追加"
 
 #: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 #: actions/openidsettings.php:93
 msgid "Add OpenID"
-msgstr "OpenIDを追加"
+msgstr "OpenID を追加"
 
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 #: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
-msgstr "OpenIDを追加���削除"
+msgstr "OpenID を追加���削除"
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "�所"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "招待�る�人�アドレス (一行�一�)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
-msgstr "全��サブスクリプション"
+msgstr "����購読"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
-msgstr "%s�全��サブスクリプション"
+msgstr "%s �����更新"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
-msgstr "\"%s\" �ヒット�る����アップデート"
+msgstr "検索語「%s��一致�る����更新"
 
 #: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
 #: ../actions/openidlogin.php:29 ../actions/register.php:30
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "既�ログイン�����。"
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "既�購読�����。"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
-msgstr ""
+msgstr "本当���通知を削除����？"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "購読を許�"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "将�的���共用PC��自動ログイン"
+msgstr "以��自動的�ログイン�る。共用コンピューター������ょ��"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
+msgstr "自分を購読���る者を自動的�購読�る (�人間�最�)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "ア�ター"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "ア�ター�更新�れ���。"
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, 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 ""
-"��アドレス�確�待���。Jabber/Gtalk �メッセージを確���下��。（%s "
-"を追加������？）"
+"��アドレス�確�待���。Jabber � Gtalk �アカウント�追加�指示�書�れ"
+"�メッセージを確�������。(%s を�人リスト�追加�����？)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
+"��アドレス�確�待���。�信ボックス（�スパムボックス）�追加�指示�書"
+"�れ�メッセージ�届������確�������。"
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
-msgstr ""
+msgstr "��電話番��確�待���。"
 
 #: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
 msgid "Before »"
-msgstr "� >>"
+msgstr "� »"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
-msgstr "�イオグラフィ"
+msgstr "自己紹介"
 
 #: ../actions/profilesettings.php:101 ../actions/register.php:82
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
-msgstr "�イオグラフィ�長����。（最長140字）"
+msgstr "自己紹介�長���� (最長140文字)。"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "��通知を削除����ん。"
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "ア�ターURL　を読��れ��ん '%s'"
@@ -431,6 +541,8 @@ msgstr "ア�ターURL　を読��れ��ん '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "新��パスワードを�存����ん。"
 
@@ -438,31 +550,34 @@ msgstr "新��パスワードを�存����ん。"
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "キャンセル"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "OpenID consumer object を生�����ん。"
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "�� Jabbar ID を正�化����ん"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "��メールアドレスを正�化����ん"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "変更"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "メール�扱�を変更"
 
@@ -472,11 +587,12 @@ msgid "Change password"
 msgstr "パスワード�変更"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "パスワード�変更"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "プロファイル設定�変更"
 
@@ -486,6 +602,9 @@ msgstr "プロファイル設定�変更"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "確�"
 
@@ -498,12 +617,14 @@ msgstr "アドレス�確�"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "確�作業�キャンセル�れ���。"
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "確�コード"
 
@@ -512,7 +633,8 @@ msgstr "確�コード"
 msgid "Confirmation code not found."
 msgstr "確�コード�見��り��ん。"
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -532,20 +654,24 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "接続"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "既存�アカウント�接続"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "コンタクト"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "OpenIDを作�����ん : %s"
@@ -553,35 +679,39 @@ msgstr "OpenIDを作�����ん : %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr ""
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "サー��リダイレクト����ん : %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "ア�ターを�存����ん"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "新��プロファイルを�存����ん"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr ""
 
@@ -601,15 +731,17 @@ msgstr "リクエストトークンをアクセストークン�変����
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "メール承�を削除����ん"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "サブスクリプションを削除����ん"
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr ""
 
@@ -622,29 +754,38 @@ msgstr "リクエストトークンを�得����ん"
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "確�コードを追加����ん"
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加����ん"
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "プロファイルを�存����ん"
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -660,42 +801,48 @@ msgstr ""
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "ユーザを更新����ん"
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "作�"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "��ニック�ーム�新��ユーザを作�"
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "アカウントを作�"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "既�ユーザ�存在�るOpenID�アカウントを作������"
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "確��れ�最新�　Jabber/GTakk アドレス"
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -704,23 +851,27 @@ msgid "Currently"
 msgstr "最新"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "返信を追加�る際�データベースエラー : %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr ""
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "140字以内�自己紹介"
 
@@ -728,11 +879,13 @@ msgstr "140字以内�自己紹介"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "メール"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr ""
 
@@ -742,39 +895,43 @@ msgid "Email Settings"
 msgstr "メール設定"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "メールアドレス�既�存在���。"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "メールアドレス確�"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "メールアドレス"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "ニック�ーム�メールアドレスを入力������。"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "�証トークンエラー"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "ユーザ�OpenID��接続エラー"
 
@@ -785,39 +942,46 @@ msgstr "ユーザ接続エラー"
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "ア�ター追加エラー"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "プロファイル追加エラー"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "リモートプロファイル追加エラー"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "アドレス確��存エラー"
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "リモートプロファイル�存エラー"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "プロファイル�存エラー"
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "ユーザ�存エラー"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "ユーザ�存エラー; �正�ユーザ"
 
@@ -826,6 +990,9 @@ msgstr "ユーザ�存エラー; �正�ユーザ"
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 
@@ -836,6 +1003,7 @@ msgstr "プロファイル更新エラー"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "リモートプロファイル更新エラー"
 
@@ -845,33 +1013,36 @@ msgid "Error with confirmation code."
 msgstr "確�コード�エラー��り��。"
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "既�存在�るニック�ーム"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "よ��る質�"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "ア�ター�更新�失敗����。"
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "%s ��も���フィード"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "%s �返信�フィード"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
@@ -886,7 +1057,7 @@ msgstr ""
 msgid "Find people on this site"
 msgstr ""
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -899,6 +1070,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "フル�ーム"
 
@@ -907,23 +1083,33 @@ msgstr "フル�ーム"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "フル�ーム�長����。（255字��）"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "ヘルプ"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "ホーム"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "ホームページ"
 
@@ -931,21 +1117,27 @@ msgstr "ホームページ"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "ホームページ�URL���切��。"
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr ""
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr ""
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IMアドレス"
 
@@ -955,7 +1147,7 @@ msgid "IM Settings"
 msgstr "IM設定"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -963,13 +1155,13 @@ msgstr ""
 "既�アカウントを����場���ユーザ��パスワード�ログイン��OpenID�関"
 "連付��下��。"
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr "OpenIDを追加�る場��下�ボックス��る\"Add\"を�リック��下��。"
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -978,55 +1170,62 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "��パスワード�間������。"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "ユーザ����パスワード�間������。"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "登録�れ�メールアドレス�パスワード�回復方法を���り����。"
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "�正�ア�ターURL '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "�正�メールアドレス：%s'"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "�正�ホームページ '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "�正�ライセンスURL '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "�正�通知内容"
 
@@ -1041,13 +1240,13 @@ msgid "Invalid notice url"
 msgstr "�正�通知url"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "�正�プロファイルURL '%s'。"
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "�正�プロファイルURL。（形��備）"
 
@@ -1065,44 +1264,52 @@ msgstr "�正�サイズ。"
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "�正�ユーザ����パスワード。"
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr ""
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 ""
-"マイクロブロギングソフト [StatusNet](http://status.net/) , �ージョン %s �動�"
-"����。 ライセンス [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)。"
+"マイクロブロギングソフト [StatusNet](http://status.net/) , �ージョン %s �動"
+"�����。 ライセンス [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)。"
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ｊ�既�別�ユーザ�使用�����。"
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1112,12 +1319,14 @@ msgstr ""
 "IMクライアントやGTalk�追加��下��。"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr ""
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
@@ -1126,7 +1335,15 @@ msgstr ""
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "場所"
 
@@ -1135,7 +1352,12 @@ msgstr "場所"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "場所�長����。（255字��）"
 
@@ -1144,18 +1366,22 @@ msgstr "場所�長����。（255字��）"
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "ログイン"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "[OpenID](%%doc.openid%%) �ログイン。"
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1163,22 +1389,26 @@ msgid ""
 "%). "
 msgstr ""
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "ログアウト"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "パスワードを紛失�忘れ�？"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -1189,16 +1419,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "�ら�メン�ー"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "マイクロブログ by %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1208,42 +1440,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "�下�テキスト��ファイルを利用�能"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "新��ニック�ーム"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "新��通知"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "新��パスワード"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "新��パスワード��存��功����。ログイン�����。"
 
@@ -1253,7 +1493,13 @@ msgstr "新��パスワード��存��功����。ログイン�
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "ニック�ーム"
 
@@ -1262,7 +1508,12 @@ msgstr "ニック�ーム"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "��ニック�ーム�既�使用�れ����。他�も�を試����下��。"
 
@@ -1271,49 +1522,60 @@ msgstr "��ニック�ーム�既�使用�れ����。他�も�
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "ニック�ーム����文字アルファベット�数字��使用����。スペース�使用"
 "����ん。"
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "��ニック�ーム�使用����ん。"
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "フォロー���ユーザ�ニック�ーム"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "ニック�ーム���メールアドレス"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr ""
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Jabbar ID ��り��ん。"
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "�証�リクエスト��り��ん。"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr ""
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr ""
 
@@ -1325,11 +1587,15 @@ msgstr "確�コード��り��ん。"
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "コンテンツ��り��ん�"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr ""
 
@@ -1338,7 +1604,9 @@ msgid "No id."
 msgstr "id ��り��ん。"
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr ""
 
@@ -1349,6 +1617,7 @@ msgstr "リモートユーザ�ニック�ーム��り��ん。"
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "ニック�ーム��り��ん。"
 
@@ -1356,12 +1625,14 @@ msgstr "ニック�ーム��り��ん。"
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "�証待��も���り��ん。"
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr ""
 
@@ -1371,7 +1642,8 @@ msgid "No profile URL returned by server."
 msgstr "サー��ら�供�れるプロファイルURL��り��ん。"
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "��ユーザ��メールアドレス�登録��り��ん。"
 
@@ -1383,7 +1655,7 @@ msgstr "リクエスト��り��ん�"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "�果��"
 
@@ -1394,12 +1666,16 @@ msgstr "サイズ��り��ん。"
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1409,13 +1685,15 @@ msgid "No such OpenID."
 msgstr "��よ��OpenID��り��ん。"
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "��よ��ドキュメント��り��ん。"
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "��よ��通知��り��ん。"
 
@@ -1453,12 +1731,22 @@ msgstr "��よ��サブスクリプション��り��ん。"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "��よ��ユーザ����ん。"
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr ""
 
@@ -1472,32 +1760,38 @@ msgid "Not a recovery code."
 msgstr "回復コード���り��ん。"
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr ""
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "有効� Jabber ID ���り��ん。"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "有効� OpenID ���り��ん。"
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "有効�メールアドレス���り��ん。"
 
@@ -1505,6 +1799,11 @@ msgstr "有効�メールアドレス���り��ん。"
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "有効�ニック�ーム���り��ん。"
 
@@ -1524,7 +1823,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "有効�プロファイルURL���り��ん。（XRDSドキュメント�無�）"
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "画������ファイル�破������。"
 
@@ -1535,11 +1835,13 @@ msgstr "�証�れ����ん。"
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "想定外�レス�ンス���"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr ""
 
@@ -1555,11 +1857,15 @@ msgstr ""
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "ログイン�����ん。"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "購読�����ん�"
 
@@ -1576,39 +1882,44 @@ msgid "Notice feed for %s"
 msgstr "%s�通知フィード"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "通知��プロファイル��り��ん。"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "通知"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "��パスワード"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "OpenID アカウントセットアップ"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "OpenID 自動�示"
 
@@ -1616,29 +1927,34 @@ msgstr "OpenID 自動�示"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "OpenID ログイン"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "OpenID ���証�キャンセル�れ���。"
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID ���証�失敗���� : %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID 障害 : %s"
@@ -1654,11 +1970,12 @@ msgid "OpenID settings"
 msgstr "OpenID 設定"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "�完全�アップロード。"
 
@@ -1668,34 +1985,46 @@ msgstr "�完全�アップロード。"
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "パスワード"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "パスワード�確��一致���ん。"
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "パスワード�6字以上���れ�����ん。"
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "パスワード回復�リクエスト�れ���"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "パスワード��存�れ���。"
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "パスワード�一致���ん。"
 
@@ -1715,14 +2044,17 @@ msgid "People search"
 msgstr "ピープルサー�"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "パーソナル"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr ""
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
@@ -1736,7 +2068,7 @@ msgstr ""
 "キャンセルをクリック��下��。"
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalk�ステータス�変更�れ�時�通知を�る。"
 
@@ -1745,7 +2077,9 @@ msgstr "Jabber/GTalk�ステータス�変更�れ�時�通知を�る。
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "設定"
 
@@ -1754,42 +2088,52 @@ msgstr "設定"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "設定��存�れ���。"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "プライ�シー"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "通知を�存�る際��題�発生����。"
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "プロファイル"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "プロファイルURL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "プロファイル設定"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "プロファイル��明"
 
@@ -1798,17 +2142,19 @@ msgid "Public Stream Feed"
 msgstr "パブリックフィード"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "パブリックタイムライン"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1818,12 +2164,14 @@ msgid "Recent Tags"
 msgstr ""
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "回復"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "パスワードを回復"
 
@@ -1836,37 +2184,45 @@ msgstr "�明�ユーザ����回復コード。"
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "登録"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr ""
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "拒�"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "ログイン状態を��"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "リモートプロファイル�一致�るも���り��ん"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "リモートサブスクライブ"
 
@@ -1880,6 +2236,9 @@ msgstr "リモートサブスクライブ"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "削除"
 
@@ -1888,7 +2247,7 @@ msgstr "削除"
 msgid "Remove OpenID"
 msgstr "OpenID を削除"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1897,34 +2256,41 @@ msgstr ""
 "OpenID を追加��下��。"
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "返信"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "%s ��返信"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "リセット"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr ""
 
@@ -1933,17 +2299,18 @@ msgstr ""
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "上���パスワード"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -1956,12 +2323,21 @@ msgstr ""
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "�存"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "検索"
 
@@ -1971,14 +2347,14 @@ msgid "Search Stream Feed"
 msgstr "ストリームフィードを検索"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 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 "%%site.name%% �通知を内容�ら検索。検索語�スペース区切る。3字以上"
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -1987,48 +2363,56 @@ msgstr ""
 "%%site.name%% �人を���場所�興味�ら検索。検索語�スペース区切る。3字以上"
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "�る"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk ���通知を���下��。"
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "設定"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "設定��存�れ���。"
 
@@ -2048,27 +2432,32 @@ msgid "Something weird happened."
 msgstr "�測�事態�発生����。"
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "ソース"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "統計データ"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "�存�れ� OpenID �見��り��ん。"
 
@@ -2076,24 +2465,28 @@ msgstr "�存�れ� OpenID �見��り��ん。"
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "購読"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "購読者"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "購読�許�"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "購読�拒�"
 
@@ -2101,28 +2494,35 @@ msgstr "購読�拒�"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "サブスクリプション"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "ファイル�アップロード�システムエラー"
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr ""
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr ""
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "文字検索"
 
@@ -2142,6 +2542,7 @@ msgid "That confirmation code is not for you!"
 msgstr "��確�コード�����も����り��ん�"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr ""
 
@@ -2151,63 +2552,73 @@ msgid "That file is too big."
 msgstr "ファイルサイズ�大�����。"
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "�� Jabber ID �既�����も���。"
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "�� Jabber ID �����も����り��ん。"
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "�� IM アドレス��正��。"
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "長����。通知�最大 140 字����。"
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "アドレス \"%s\" �����アカウント���承��れ����。"
@@ -2216,18 +2627,22 @@ msgstr "アドレス \"%s\" ã�¯ã�‚ã�ªã�Ÿã�®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã�¨ã�—ã�¦æ‰¿èª�ã�•ã‚Œã
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "アドレス�削除�れ���。"
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2235,33 +2650,38 @@ msgid ""
 msgstr ""
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "%s　�通知を����る人"
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "����通知を����る人"
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s �通知を����る人"
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "����通知を����る人"
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "確�コード������。も�一度やり直������。"
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2270,7 +2690,7 @@ msgstr ""
 "クリック��下��。OpenIDプロ�イダ�転��れ��。"
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2284,6 +2704,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
@@ -2292,25 +2715,37 @@ msgstr ""
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "��ページ�����承���メディアタイプ��利用����ん。"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2323,18 +2758,21 @@ msgstr ""
 "下��."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "ホームページ�ブログ�プロファイル���他サイト� URL"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "プロファイルサービス���マイクロブロギングサービス�URL"
 
@@ -2346,15 +2784,22 @@ msgstr "プロファイルサービス���マイクロブロギングサー
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "予期��フォーム�信��。"
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "予期��パスワード�リセット��。"
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr ""
 
@@ -2385,38 +2830,47 @@ msgstr "サブスクライブ中止"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "サ�ート外� OMB �ージョン"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "サ�ート外�画�形���。"
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "アップロード"
 
@@ -2437,12 +2891,15 @@ msgid "Upload a new profile image"
 msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "更新�アナウンス�パスワードリカ�リー���使用�れ��。"
 
@@ -2466,11 +2923,16 @@ msgstr "リスト�れ��るユーザ�存在���ん。"
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "プロファイル��り��ん。"
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "ユーザ�ニック�ーム"
 
@@ -2479,29 +2941,33 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "最近�� %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "�る場所, 例�� \"City, State (or Region), Country\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "�正�画�形�。'%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "�正�画�サイズ。'%s'"
@@ -2509,7 +2975,9 @@ msgstr "�正�画�サイズ。'%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr ""
 
@@ -2530,11 +2998,12 @@ msgid "You are already logged in!"
 msgstr "既�ログイン済���。"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2552,13 +3021,14 @@ msgstr "アカウントを作���通知�投稿��能��。"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "\"削除\"をクリック�� OpenID を削除����。"
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2567,7 +3037,8 @@ msgstr ""
 "Jabber/GTalk [instant messages](%%doc.im%%)　経由�通知��信��信��能�"
 "�。下�アドレスを設定��下��。"
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2578,21 +3049,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "ローカルサブスクリプションを使用�能���"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "ライセンス���頂���場��登録����ん。"
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "��プロファイル��信�れ����ん。"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2606,35 +3079,39 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr ""
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "確��れ���。新��パスワードを入力��下��。"
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "���� OpenID URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "��サー���ニック�ーム����登録��メールアドレス。"
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2643,47 +3120,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) を使����アカウント�様々�ウェブサイト�ログイン"
 "�る�������。���関連付�る OpenID を管���下��。"
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "数秒�"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "約 %d 日�"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "約 %d 時間�"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "約 %d 分�"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "約 %d ヵ月�"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "約 1 日�"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "約 1 分�"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "約 1 ヵ月�"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "約 1 年�"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "約 1 時間�"
 
@@ -2705,12 +3192,14 @@ msgid "reply"
 msgstr "返信"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "上�パスワード���"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr ""
 
@@ -2732,6 +3221,26 @@ msgstr "<< �"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2740,6 +3249,7 @@ msgid "This notice is not a favorite!"
 msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -2747,22 +3257,28 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2772,11 +3288,13 @@ msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2816,33 +3334,44 @@ msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr ""
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr ""
 
@@ -2896,6 +3425,11 @@ msgstr ""
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr ""
 
@@ -2924,6 +3458,8 @@ msgid "New password successfully saved. "
 msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2944,12 +3480,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2957,7 +3496,7 @@ msgstr ""
 msgid "No such message."
 msgstr ""
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
@@ -2981,51 +3520,70 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
@@ -3044,14 +3602,17 @@ msgid ""
 msgstr ""
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr ""
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr ""
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -3060,6 +3621,7 @@ msgid "Twitter Username"
 msgstr ""
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr ""
 
@@ -3068,24 +3630,29 @@ msgid "Twitter Password"
 msgstr ""
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -3096,33 +3663,43 @@ msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -3139,18 +3716,19 @@ msgid "The subscription has been rejected, but no "
 msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3160,89 +3738,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3250,11 +3850,11 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3269,7 +3869,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -3281,7 +3881,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3290,31 +3890,39 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr ""
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr ""
 
@@ -3327,14 +3935,19 @@ msgid "Twitter integration options"
 msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s & �も��"
@@ -3344,22 +3957,32 @@ msgid "You can upload your personal avatar."
 msgstr ""
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "設定"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
@@ -3376,35 +3999,44 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "��よ��通知��り��ん。"
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr ""
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "��よ��ユーザ����ん。"
@@ -3413,12 +4045,12 @@ msgstr "��よ��ユーザ����ん。"
 msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 #, fuzzy
 msgid "You have already blocked this user."
 msgstr "既�ログイン済���。"
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3435,40 +4067,58 @@ msgstr ""
 msgid "Add to favorites"
 msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "ニック�ーム��り��ん。"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "��よ��通知��り��ん。"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3480,16 +4130,17 @@ msgstr ""
 "����ん。"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "�イオグラフィ�長����。（最長140字）"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "ユーザを更新����ん"
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 #, fuzzy
 msgid "Options saved."
 msgstr "設定��存�れ���。"
@@ -3507,7 +4158,8 @@ msgstr ""
 msgid "Send me email when someone "
 msgstr ""
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3523,7 +4175,7 @@ msgstr ""
 "確�用コードを入力�れ�IMアドレス��信����。メッセージを確��る���%"
 "sを承���下��。"
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3537,54 +4189,69 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "コンテンツ��り��ん�"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 #, fuzzy
 msgid "After"
 msgstr "<< �"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "� >>"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "%s ��も���フィード"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3630,12 +4297,14 @@ msgstr ""
 msgid "Sync preferences"
 msgstr "設定"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr ""
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "��よ��通知��り��ん。"
@@ -3650,7 +4319,8 @@ msgid "The most popular notices on the site right now."
 msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3664,15 +4334,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr ""
 
@@ -3680,12 +4352,14 @@ msgstr ""
 msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "ア�ター�更新�れ���。"
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "ア�ター�更新�失敗����。"
@@ -3705,7 +4379,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
@@ -3720,6 +4395,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "アカウントを作�"
@@ -3731,7 +4407,7 @@ msgid ""
 msgstr ""
 "%%site.name%% �人を���場所�興味�ら検索。検索語�スペース区切る。3字以上"
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "ピープルサー�"
@@ -3755,21 +4431,21 @@ msgstr "Jabber/GTalk ���通知を���下��。"
 msgid "A confirmation code was sent "
 msgstr "確�コード��り��ん。"
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "既�ログイン済���。"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "サー��リダイレクト����ん : %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr ""
@@ -3778,16 +4454,19 @@ msgstr ""
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "��よ��通知��り��ん。"
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "��プロファイル��信�れ����ん。"
@@ -3796,21 +4475,25 @@ msgstr "��プロファイル��信�れ����ん。"
 msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr ""
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "OpenIDを作�����ん : %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -3822,16 +4505,18 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "ア�ターを�存����ん"
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "サブスクリプションを作�����ん"
@@ -3845,12 +4530,15 @@ msgstr "ファイルサイズ�大�����。"
 msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 #, fuzzy
 msgid "Notice posted"
 msgstr "通知"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr ""
 
@@ -3867,7 +4555,7 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "OpenID ログイン"
@@ -3895,11 +4583,13 @@ msgstr ""
 msgid "Service"
 msgstr "検索"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "場所�長����。（255字��）"
@@ -3909,17 +4599,18 @@ msgstr "場所�長����。（255字��）"
 msgid "Change your password."
 msgstr "パスワード�変更"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "パスワード��存�れ���。"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "有効�メールアドレス���り��ん。"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -3929,12 +4620,13 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "プロファイル��明"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -3944,21 +4636,26 @@ msgid "Automatically subscribe to whoever "
 msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "�正�ホームページ '%s'"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "プロファイルを�存����ん"
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "パブリックタイムライン"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
@@ -3979,11 +4676,13 @@ msgstr "パブリックフィード"
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4039,7 +4738,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "%s ��返信"
@@ -4049,53 +4749,74 @@ msgstr "%s ��返信"
 msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "��よ��通知��り��ん。"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "通知"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "%s�通知フィード"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "�ら�メン�ー"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr ""
 
@@ -4110,7 +4831,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4121,32 +4842,39 @@ msgid "'s profile"
 msgstr "プロファイル"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "プロファイル��り��ん。"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr ""
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr ""
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "購読者"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr ""
 
@@ -4172,7 +4900,7 @@ msgstr "Jabber/GTalk ���通知を���下��。"
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "��確�コード�����も����り��ん�"
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr ""
 
@@ -4236,17 +4964,18 @@ msgstr "%s �通知を����る人"
 msgid "These are the people whose "
 msgstr "%s　�通知を����る人"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "Jabbar ID ��り��ん。"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "マイクロブログ by %s"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4270,7 +4999,7 @@ msgstr ""
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4280,17 +5009,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "ア�ターを�存����ん"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4299,20 +5028,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "��よ��通知��り��ん。"
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "マイクロブログ by %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "ユーザ�ブロック�失敗����。"
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "ユーザ�アンブロック�失敗����。"
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "見��り��ん。"
 
@@ -4320,15 +5052,16 @@ msgstr "見��り��ん。"
 msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Twitterパスワード"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Twitterフレンド"
 
@@ -4341,147 +5074,156 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr "アカウント情報を�得����ん"
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "ブロック�削除エラー"
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "リクエスト内�プロファイルID��り��ん。"
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "��ID�プロファイル���り��ん。"
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "サブスクライブ解除済�"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "%s グループ"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s グループ, %d ページ"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "通知を�存�る際��題�発生����。"
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "ア�ター�アップロード"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "��他"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "��他�オプション"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr ""
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "�称未設定ページ"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "人々�テキストを検索"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "アカウント"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "メールアドレス�ア�ター�パスワード�プロパティ�変更"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "IM�SMS�Twitter�接続"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "サイト�らログアウト"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "サイト�ログイン"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "アカウントを作�"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "OpenID�ログイン"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "助���"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "新��通知"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "新��通知"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "サブスクリプション"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "ライセンス。"
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "��ユーザをブロック�る"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "ブロック"
 
@@ -4494,11 +5236,14 @@ msgstr ""
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr "新��アカウント"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "発行済"
 
@@ -4518,31 +5263,36 @@ msgstr "タグ�フィルター"
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "ã‚¿ã‚°"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "移動"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "グループやトピック�ホームページやブログ� URL"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "概�"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "グループやトピックを140字以内記述"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4552,20 +5302,20 @@ msgstr "�る場所, 例�� \"City, State (or Region), Country\""
 msgid "Group"
 msgstr "グループ"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "管�者"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "%s グループプロパティを編集"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "ロゴ"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "%s ロゴ�追加や編集"
@@ -4596,11 +5346,11 @@ msgstr "�加"
 msgid "Leave"
 msgstr "離れる"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "ユーザ��パスワード�ログイン"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "新��アカウント�サインアップ"
 
@@ -4620,24 +5370,24 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s � %2$s �����通知を������。"
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "場所: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "ホームページ: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "���� %s ���れ����"
@@ -4652,40 +5402,48 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s � %2$s �����通知を������。"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "直接通知を�る"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "通知を�る"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "利用�能�文字"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 #, fuzzy
 msgid "in reply to"
 msgstr "...�対���返信"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "��通知�返信"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "返信"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "��通知を削除"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "削除"
 
@@ -4706,27 +5464,29 @@ msgstr "��ユーザ���を�る"
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(��)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "パブリック"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "ユーザグループ"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "最近�タグ"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "人気"
 
@@ -4742,32 +5502,34 @@ msgstr "��サイト上�グループを検索�る"
 msgid "Untitled section"
 msgstr "�称未設定�セクション"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "リモートサブスクライブ"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "リモートサブスクライブ"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "プロファイル��り��ん。"
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "購読�許�"
@@ -4781,10 +5543,11 @@ msgid "Top posters"
 msgstr "上�投稿者"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "��ユーザをアンブロック�る"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "アンブロック"
 
@@ -4792,22 +5555,2013 @@ msgstr "アンブロック"
 msgid "Unsubscribe from this user"
 msgstr "��ユーザ�ら�サブスクライブを解除�る"
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s ��も���フィード"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s ��も���フィード"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s ��も���フィード"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s & �も��"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "ア�ター�更新�れ���。"
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "マイクロブログ by %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"%%site.name%% �人を���場所�興味�ら検索。検索語�スペース区切る。3字以上"
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "\"%s\" �ストリームを検索"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"セキュリティー上��由�より�設定を変更�る��ユーザ��パスワードを入力�"
+"�下��。"
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "パブリックフィード"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "パブリックフィード"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "パブリックフィード"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "個人情報を除�:パスワード�メールアドレス�IMアドレス�電話番�"
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "作�"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "��よ��通知��り��ん。"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "プロファイル"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s�通知フィード"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s�通知フィード"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s�通知フィード"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "ア�ター"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "プロファイル設定"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "��確�コード�����も����り��ん�"
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "��よ��ユーザ����ん。"
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "アカウント情報を�得����ん"
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"ユーザ�通知を購読�る��詳細を確���下��。購読���場���\"Cancel\" "
+"キャンセルをクリック��下��。"
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "人々�テキストを検索"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "IM�SMS�Twitter�接続"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "��"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"既�アカウントを����場���ユーザ��パスワード�ログイン��OpenID�関"
+"連付��下��。"
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s � %2$s �����通知を������。\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"確������,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "検索"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "��よ��ドキュメント��り��ん。"
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "サー��リダイレクト����ん : %s"
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "��ユーザをブロック�る"
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "プロファイル��り��ん。"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s & �も��"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "ユーザ�アンブロック�失敗����。"
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "確�コード"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "��通知を削除����ん。"
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "�正�ホームページ '%s'"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "��ニック�ーム�既�使用�れ����。他�も�を試����下��。"
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "ア�ターを�存����ん"
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "新��通知"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "新��通知"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "有効�ニック�ーム���り��ん。"
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "プロファイル��り��ん。"
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "��プロファイル��信�れ����ん。"
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "��よ��ユーザ����ん。"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "ユーザを更新����ん"
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "設定��存�れ���。"
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "管�者"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "�果��"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "アカウントを作�"
+msgid "User is not blocked from group."
+msgstr "プロファイル��り��ん。"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "メールを確�����ん"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
 
-#~ msgid "Email address"
-#~ msgstr "メールアドレス"
+#: actions/newmessage.php:178 actions/newmessage.php:181
+msgid "Message sent"
+msgstr ""
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "通知追加エラー"
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "プロファイルを�存����ん"
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) を使����アカウント�様々�ウェブサイト�ログイン"
+"�る�������。���関連付�る OpenID を管���下��。"
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "プロファイル設定"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've 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
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "確��れ���。新��パスワードを入力��下��。"
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "パスワードを忘れ�場��登録�れ�アドレス�新��も�を���る�����"
-#~ "��。"
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "パスワード回復�リクエスト�れ���"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "確�コード�エラー��り��。"
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "購読�許�"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "��よ��通知��り��ん。"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%s�通知フィード"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "%s�通知フィード"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "%s�通知フィード"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "管�者"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "��よ��ユーザ����ん。"
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%s�通知フィード"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s � %2$s �����通知を������。"
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s�通知フィード"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s�通知フィード"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "ユーザを更新����ん"
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "ユーザを更新����ん"
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$ �ステータス %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "マイクロブログ by %s"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "ライセンス。"
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "全��サブスクリプション"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "プロファイル設定"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "��プロファイル��信�れ����ん。"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "通知を�存�る際��題�発生����。"
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "プロファイル��り��ん。"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "プロファイル"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "アップロード"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "パスワード�変更"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "接続"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "検索"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "ログイン"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "ブロック"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "��よ��ユーザ����ん。"
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "%s ロゴ�追加や編集"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "コンテンツ��り��ん�"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "検索"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "ホームページ�URL���切��。"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "��よ��通知��り��ん。"
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "長����。通知�最大 140 字����。"
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "サー��リダイレクト����ん : %s"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "�イオグラフィ�長����。（最長140字）"
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "既�ログイン済���。"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "サー��リダイレクト����ん : %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "��プロファイル��信�れ����ん。"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "OpenIDを作�����ん : %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s グループ"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "��プロファイル��信�れ����ん。"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "��サイト上�グループを検索�る"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "ア�ター�更新�れ���。"
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "長����。通知�最大 140 字����。"
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "サ�ート外�画�形���。"
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "�イオグラフィ�長����。（最長140字）"
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "マイクロブログ by %s"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "リスト�れ��るユーザ�存在���ん。"
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "�証�れ����ん。"
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "リクエストトークンをアクセストークン�変�����ん"
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "予期�� OMB プロトコル��ージョン��。"
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "��よ��通知��り��ん。"
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "��よ��通知��り��ん。"
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "マイクロブログ by %s"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "��ページ�����承���メディアタイプ��利用����ん。"
+
+#: actions/login.php:259
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "マイクロブログ by %s"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "検索語「%s��一致�る����更新"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "接続"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "140字以内�自己紹介"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "140字以内�自己紹介"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "自己紹介�長���� (最長140文字)。"
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "有効�プロファイルURL���り��ん。（XRDSドキュメント�無�）"
+
+#: 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 "リクエストトークンを�得����ん"
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%s�通知フィード"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%s�通知フィード"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "%s�通知フィード"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "%s ��返信"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s ��も���フィード"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s ��も���フィード"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s ��も���フィード"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "%s�通知フィード"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "通知"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "��ページ�����承���メディアタイプ��利用����ん。"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s�通知フィード"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"ユーザ�通知を購読�る��詳細を確���下��。購読���場���\"Cancel\" "
+"キャンセルをクリック��下��。"
+
+#: actions/userauthorization.php:249
+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:261
+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:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "ア�ターURL　を読��れ��ん '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "�正�画�形�。'%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "サー��リダイレクト����ん : %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "新��通知"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "ユーザを更新����ん"
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "��通知�返信"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "通知を�存�る際��題�発生����。"
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "確�コード��り��ん。"
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "サイト�ログイン"
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "グループやトピックを140字以内記述"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "グループやトピックを140字以内記述"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "新��通知"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%1$s � %2$s �����通知を������。"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "�ら "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "ユーザを更新����ん"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "新��通知"
diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
index 2b177ff86..572c95567 100644
--- a/locale/ko/LC_MESSAGES/statusnet.mo
+++ b/locale/ko/LC_MESSAGES/statusnet.mo
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 7bbdcdcf2..4f304f221 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -1,30 +1,29 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Korean
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-06-23 04:01+0000\n"
-"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:43:59+0000\n"
+"Language-Team: Korean\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ko\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "스트림�서 \"%s\" 검색"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr "다� 개�정보 제외: 비밀 번호, 메� 주소, 메신저 주소, 전화 번호"
@@ -35,17 +34,19 @@ msgid " from "
 msgstr "다��서:"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / %2$s�게 답신 업��트"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s님� 귀하를 %2$s� 초대하였습니다."
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -77,10 +78,11 @@ msgid ""
 msgstr ""
 "%1$s님� 귀하를 %2$s(%3$s)� 초대하였습니다.\n"
 "\n"
-"%2$s 서비스는 여러분� 친구 �는 같� 관심사를 가진 사람들� 최신 소�� �� 수 있는 마��로블로깅 서비스 입니다.\n"
+"%2$s 서비스는 여러분� 친구 �는 같� 관심사를 가진 사람들� 최신 소�� �"
+"� 수 있는 마��로블로깅 서비스 입니다.\n"
 "\n"
-"�기 �신�나, ��, �활� 대한 소�� 다른 사람�게 알릴 수 있습니다. � 같� 관심사를 지닌 새로운 사람들� 만날 수 있는 좋� "
-"장소입니다.\n"
+"�기 �신�나, ��, �활� 대한 소�� 다른 사람�게 알릴 수 있습니다. � 같"
+"� 관심사를 지닌 새로운 사람들� 만날 수 있는 좋� 장소입니다.\n"
 "%1$s님� �하기를:\n"
 "%4$s\n"
 "\n"
@@ -97,6 +99,7 @@ msgstr ""
 "%2$s 보냄\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s님� 귀하� 알림 메시지를 %2$s�서 듣고 있습니다."
@@ -117,25 +120,28 @@ msgstr ""
 "그럼 �만,%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s님� %2$s/%3$s� 업��트� 답변했습니다."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s� �태 (%2$s�서)"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s �블릭 스트림"
@@ -145,40 +151,57 @@ msgstr "%s �블릭 스트림"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s � 친구들"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 공개 타임��"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s �태"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s 타임��"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "모�로부터� 업��트 %s개!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
-msgstr "(지금 귀하는 귀하� �메� 주소를 확�하는 방법� 대한 지침� 메�로 받으셨습니다.)"
+msgstr ""
+"(지금 귀하는 귀하� �메� 주소를 확�하는 방법� 대한 지침� 메�로 받으셨습"
+"니다.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -187,7 +210,8 @@ msgstr ""
 "**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 "
 "마��로블로깅서비스입니다."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** 는 마��로블로깅서비스입니다."
@@ -199,47 +223,60 @@ msgstr ". 가입�는 �름�나 별명으로 기재�어야 합니다."
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64� 사�� �소문�, 숫�로만 �니다. 기호나 공백� 쓰면 안 �니다."
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64� 사�� �소문�, 숫�로만 �니다. 기호나 공백� 쓰면 안 �니다. 필수 입력."
+msgstr ""
+"1-64� 사�� �소문�, 숫�로만 �니다. 기호나 공백� 쓰면 안 �니다. 필수 "
+"ìž…ë ¥."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6글� ��"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6글� ��, 잊어 버리지 마십시오!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6글� ��� 필요합니다."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
-msgstr "추가한 메신저 주소로 �� 코드를 보냈습니다. %s 사용�를 허�해야 메시지를 전달할 수 있습니다."
+msgstr ""
+"추가한 메신저 주소로 �� 코드를 보냈습니다. %s 사용�를 허�해야 메시지를 전"
+"달할 수 있습니다."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
-msgstr "추가한 �메�로 �� 코드를 보냈습니다. 수신함(�는 스팸함)� 확�하셔서 코드와 사용법� 확�하여 주시기 바�니다."
+msgstr ""
+"추가한 �메�로 �� 코드를 보냈습니다. 수신함(�는 스팸함)� 확�하셔서 코드"
+"와 사용법� 확�하여 주시기 바�니다."
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your inbox "
 "(and spam box!) for the code and instructions on how to use it."
-msgstr "추가한 휴대�으로 �� 코드를 보냈습니다. 수신함(�는 스팸함)� 확�하셔서 코드와 사용법� 확�하여 주시기 바�니다."
+msgstr ""
+"추가한 휴대�으로 �� 코드를 보냈습니다. 수신함(�는 스팸함)� 확�하셔서 코"
+"드와 사용법� 확�하여 주시기 바�니다."
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -259,7 +296,34 @@ msgstr "추가한 휴대í�°ìœ¼ë¡œ ì�¸ì¦� 코드를 보냈습니다. 수신함(ë˜
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API 메서드를 찾� 수 없습니다."
 
@@ -282,16 +346,23 @@ msgstr "API 메서드를 찾� 수 없습니다."
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "API 메서드를 구성중 입니다."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "ì •ë³´"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "수�"
 
@@ -302,6 +373,9 @@ msgstr "수�"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "추가"
 
@@ -319,27 +393,29 @@ msgstr "OpenID 추가 �는 삭제"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "주소"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "초청할 친구들� 주소 (한 줄� 한 명씩)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "모든 예약 구�"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "%s� 모든 업��트"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "\"%s\" � �치하는 모든 업��트"
@@ -349,30 +425,37 @@ msgstr "\"%s\" � �치하는 모든 업��트"
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "�미 로그� 하셨습니다."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "�미 구�하고 있습니다."
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "정�로 통지를 삭제하시겠습니까?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "구�� 허가"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "앞으로는 ��으로 로그�합니다. 공용 컴퓨터�서는 �용하지 마십시오!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "나�게 구�하는 사람�게 �� 구� 신청"
@@ -380,29 +463,38 @@ msgstr "나�게 구�하는 사람�게 �� 구� 신청"
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "아바타"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "아바타가 업��트 �었습니다."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, 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 "� 주소는 �� 대기 중입니다. Jabber/Gtalk로 메시지를 확�해 주십시오.(%s 항목� 추가하셨습니까?)"
+msgstr ""
+"� 주소는 �� 대기 중입니다. Jabber/Gtalk로 메시지를 확�해 주십시오.(%s 항"
+"목� 추가하셨습니까?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
-msgstr "� 주소는 �� 대기중입니다. 수신함(�는 스팸함)� 확�하셔서 지침� 확�해 주시기 바�니다."
+msgstr ""
+"� 주소는 �� 대기중입니다. 수신함(�는 스팸함)� 확�하셔서 지침� 확�해 "
+"주시기 바�니다."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "� 전화 번호는 �� 대기중입니다."
 
@@ -413,6 +505,8 @@ msgstr "뒤로 >>"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "�기소개"
 
@@ -420,16 +514,18 @@ msgstr "�기소개"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "�기소개가 너무 �니다. (최대 140글�)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "� 통지를 지울 수 없습니다."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "아바타 URL '%s'�(를) �어낼 수 없습니다."
@@ -437,6 +533,8 @@ msgstr "아바타 URL '%s'�(를) �어낼 수 없습니다."
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "새 비밀번호를 저장 할 수 없습니다."
 
@@ -444,31 +542,34 @@ msgstr "새 비밀번호를 저장 할 수 없습니다."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "취소"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "OpenID consumer object를 �성할 수 없습니다."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "그 Jabbar ID를 정규화 할 수 없습니다."
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "그 �메� 주소를 정규화 할 수 없습니다."
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "변환"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "�메� 처리 변경"
 
@@ -478,11 +579,12 @@ msgid "Change password"
 msgstr "비밀번호 바꾸기"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "비밀번호 바꾸기"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "프로필 세팅 바꾸기"
 
@@ -492,6 +594,9 @@ msgstr "프로필 세팅 바꾸기"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "��"
 
@@ -504,12 +609,14 @@ msgstr "주소 ��"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "�� 취소"
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "�� 코드"
 
@@ -518,7 +625,8 @@ msgstr "�� 코드"
 msgid "Confirmation code not found."
 msgstr "�� 코드가 없습니다."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -536,31 +644,40 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"%s님 축하드립니다! %%%%site.name%%%%� 가입하신 것� 환�합니다!. �제부터 아래� �� 할 수 있습니다...\n"
+"%s님 축하드립니다! %%%%site.name%%%%� 가입하신 것� 환�합니다!. �제부터 아"
+"래� �� 할 수 있습니다...\n"
 "\n"
 "* [나� 프로필](%s) 로 가셔서 첫 메시지를 �스트 해보십시오.\n"
-"* [Jabber �는 GTalk계정](%%%%action.imsettings%%%%)� 추가하셔서 메신저로 통보를 받아 보십시오.\n"
-"* [친구 찾기](%%%%action.peoplesearch%%%%) 알거나 같� 관심사를 가지고 있는 분들� 찾아 보십시오. \n"
-"* [프로필 셋팅](%%%%action.profilesettings%%%%)� 업��트 하셔서 다른분들�게 �신� 알려보십시오. \n"
-"* [온�� �움�](%%%%doc.help%%%%)� �으면서 � 많� 기능� 확�해 보십시오. \n"
+"* [Jabber �는 GTalk계정](%%%%action.imsettings%%%%)� 추가하셔서 메신저로 통"
+"보를 받아 보십시오.\n"
+"* [친구 찾기](%%%%action.peoplesearch%%%%) 알거나 같� 관심사를 가지고 있는 "
+"분들� 찾아 보십시오. \n"
+"* [프로필 셋팅](%%%%action.profilesettings%%%%)� 업��트 하셔서 다른분들�"
+"게 �신� 알려보십시오. \n"
+"* [온�� �움�](%%%%doc.help%%%%)� �으면서 � 많� 기능� 확�해 보십시"
+"오. \n"
 "\n"
 "다시 한번 가입하신 것� 환�하면서 �거운 서비스가 �셨으면 합니다."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "ì—°ê²°"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "기존� 계정으로 접�"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "연�하기"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "OpenID를 작성 할 수 없습니다 : %s"
@@ -568,35 +685,39 @@ msgstr "OpenID를 작성 할 수 없습니다 : %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "따�가실 수 없습니다 : %s 님� �미 리스트� 있습니다."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "따�가실 수 없습니다 : 사용�가 없습니다."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "서버� 재접� 할 수 없습니다 : %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "아바타(Avatar)를 저장 할 수 없습니다."
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "새 프로필 정보를 저장 할 수 없습니다."
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "다른 사람� 구� 하실 수 없습니다."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "구� 하실 수 없습니다."
 
@@ -616,15 +737,17 @@ msgstr "리퀘스트 토í�°ì�„ 엑세스 토í�°ìœ¼ë¡œ 변환 í•  수 없습니ë‹
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "�메� 승�� 삭제 할 수 없습니다."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "예약 구�� 삭제 할 수 없습니다."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "어떠한 �태� 찾� 수 없습니다."
 
@@ -637,29 +760,38 @@ msgstr "리퀘스트 토�� 취� 할 수 없습니다."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "확� 코드를 추가 할 수 없습니다."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "예약 구�� 추가 할 수 없습니다."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "프로필� 저장 할 수 없습니다."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "��구�� 사용�를 업��트 할 수 없습니다."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "사용� 기�� 업��트 할 수 없습니다."
 
@@ -675,42 +807,48 @@ msgstr "사용� 기�� 업��트 할 수 없습니다."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "사용�를 업��트 할 수 없습니다."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "�성"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "� 닉네임으로 새 사용�를 �성"
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "새 계정� �성"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "�미 사용�가 있는 OpenID로 새 계정� �성"
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "확�� 최신� Jabber/GTalk 계정"
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "확�� 최신� SMS가 가능한 휴대� 번호"
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "확�� 최신� �메� 계정"
 
@@ -719,23 +857,27 @@ msgid "Currently"
 msgstr "최신"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "해쉬테그를 추가 할 때� ��타베�스 �러 : %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "답신� 추가 할 때� ��타베�스 �러 : %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "통지 삭제"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "140� �내�서 �기 소개"
 
@@ -743,11 +885,13 @@ msgstr "140� �내�서 �기 소개"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "�메�"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "�메� 주소"
 
@@ -757,39 +901,43 @@ msgid "Email Settings"
 msgstr "�메� 세팅"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "�메� 주소가 �미 존재 합니다."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "�메� 주소 확�서"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "\"UserName@example.org\" 와 같� �메� 계정"
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "�메� 주소"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "별명�나 �메� 계정� 입력하십시오."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "휴대�으로 받으신 ��번호를 입력하십시오."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "�� 토� �러"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "OpenID로 접� 오류"
 
@@ -800,39 +948,46 @@ msgstr "사용�� 접� 오류"
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "아바타 추가 오류"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "새 프로필 추가 오류"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "리모트 프로필 추가 오류"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "주소 확� 저장 �러"
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "리모트 프로필 저장 오류"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "프로필 저장 오류"
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "사용� 저장 오류"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "사용� 저장 오류; 무효한 사용�"
 
@@ -841,6 +996,9 @@ msgstr "사용� 저장 오류; 무효한 사용�"
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "사용� 세팅 오류"
 
@@ -851,6 +1009,7 @@ msgstr "프로필 업��트 오류"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "리모트 프로필 업��트 오류"
 
@@ -860,33 +1019,36 @@ msgid "Error with confirmation code."
 msgstr "확� 코드 오류"
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "존재하는 별명"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "�주 묻는 질문"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "아바타 업��트 실패"
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "%s� 친구들� 위한 피드"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "%s� 답신 피드"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "%s 태그� 피드"
@@ -901,17 +1063,23 @@ msgstr "통지들� 내용 찾기"
 msgid "Find people on this site"
 msgstr "� 사�트� 있는 사람 찾기"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
-msgstr "보안� 위해 세팅� 저장하기 전� 계정과 비밀 번호를 다시 입력 해 주십시오."
+msgstr ""
+"보안� 위해 세팅� 저장하기 전� 계정과 비밀 번호를 다시 입력 해 주십시오."
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "실명"
 
@@ -920,23 +1088,33 @@ msgstr "실명"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "실명� 너무 �니다. (최대 255글�)"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "�움�"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "홈"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "홈페�지"
 
@@ -944,21 +1122,27 @@ msgstr "홈페�지"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "홈페�지 주소형�� 올바르지 않습니다."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "�메�로 통보를 �스트 하길 �합니다."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "메신저"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "메신저 주소"
 
@@ -968,76 +1152,87 @@ msgid "IM Settings"
 msgstr "메신저 설정"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
-msgstr "만� 계정� �미 가지고 계신다면, 계정과 비밀 번호로 OpenID로 접�하기 위하여 입력해 주세요."
+msgstr ""
+"만� 계정� �미 가지고 계신다면, 계정과 비밀 번호로 OpenID로 접�하기 위하"
+"여 입력해 주세요."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
-msgstr "만� 새 OpenID를 추가하시려면, 밑� 박스� 입력하신 후 \"추가\"를 누르십시오."
+msgstr ""
+"만� 새 OpenID를 추가하시려면, 밑� 박스� 입력하신 후 \"추가\"를 누르십시오."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've 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/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "받� �메�"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "받� �메� 계정 삭제"
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "기존 비밀 번호가 틀렸습니다"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "틀린 계정 �는 비밀 번호"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "가입하신 �메�로 비밀 번호 재발급� 관한 안내를 보냈습니다."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "옳지 않� 아바타 URL '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "옳지 않� �메� 주소 : %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "옳지 않� 홈페�지 '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "옳지 않� ��선스 URL '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "옳지 않� 통지 내용"
 
@@ -1052,13 +1247,13 @@ msgid "Invalid notice url"
 msgstr "옳지 않� 통지 url"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "옳지 않� 프로필 URL '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "옳지 않� 프로필 URL (나� �멧)"
 
@@ -1076,60 +1271,69 @@ msgstr "옳지 않� �기"
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "사용� �름�나 비밀 번호가 틀렸습니다."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "초대권� 보냈습니다"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "다� 사람들�게 초대권� 보냈습니다:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "초대"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "새 사용�를 초대"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 ""
-"� 사�트는 [StatusNet](http://status.net/) 마��로블로깅 소프트웨어 %s 버전� 사용합니다. StatusNet는 "
-"[GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) ��선스� 따� 사용할 수 "
-"있습니다."
+"� 사�트는 [StatusNet](http://status.net/) 마��로블로깅 소프트웨어 %s 버전"
+"� 사용합니다. StatusNet는 [GNU Affero General Public License](http://www."
+"fsf.org/licensing/licenses/agpl-3.0.html) ��선스� 따� 사용할 수 있습니다."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID가 �미 다른 사용�� �하여 사용�고 있습니다."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, 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 ""
-"\"UserName@example.org\" 와 같� Jabber �는 GTalk 계정� 귀하� 메신저나 GTalk 친구목�� 반드시 %s "
-"주소를 추가하여 주십시오."
+"\"UserName@example.org\" 와 같� Jabber �는 GTalk 계정� 귀하� 메신저나 "
+"GTalk 친구목�� 반드시 %s 주소를 추가하여 주십시오."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "언어"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "언어가 너무 �니다. (최대 50글�)"
 
@@ -1138,7 +1342,15 @@ msgstr "언어가 너무 �니다. (최대 50글�)"
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "위치"
 
@@ -1147,7 +1359,12 @@ msgstr "위치"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "위치가 너무 �니다. (최대 255글�)"
 
@@ -1156,43 +1373,52 @@ msgstr "위치가 너무 �니다. (최대 255글�)"
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "로그�"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "[OpenID](%%doc.openid%%)로 로그�하세요."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
 "(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
 "%). "
 msgstr ""
-"귀하� 계정과 비밀 번호로 로그� 하세요. 계정� 아� 없으세요? [가입](%%action.register%%) 새 계정� �성 �는 "
-"[OpenID](%%action.openidlogin%%)를 사용해 보세요."
+"귀하� 계정과 비밀 번호로 로그� 하세요. 계정� 아� 없으세요? [가입](%%"
+"action.register%%) 새 계정� �성 �는 [OpenID](%%action.openidlogin%%)를 사"
+"용해 보세요."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "로그아웃"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "�욱 긴 �름� 요구합니다."
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "비밀 번호를 잊으셨나요?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "�스팅� 위한 새 �메� 계정� �성; 전 �메� 계정� 취소."
 
@@ -1203,16 +1429,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%%�서 어떻게 �메�� 받�지 정하십시오."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "가입한 때"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "%s� 마��로블로그"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1222,44 +1450,53 @@ msgstr "귀하� 휴대�� 통신회사는 무엇입니까?"
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "나� 글과 파�� ��선스는 다�과 같습니다 "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "새로운"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s� �스팅 할 새로운 �메� 주소"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "새로운 �메� 주소가 추가 �었습니다."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "새로운 별명"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "새로운 통지"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "새로운 비밀 번호"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
-msgstr "새로운 비밀 번호를 성공�으로 저장했습니다. 귀하는 �제 로그� �었습니다."
+msgstr ""
+"새로운 비밀 번호를 성공�으로 저장했습니다. 귀하는 �제 로그� �었습니다."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151 actions/login.php:101
@@ -1267,7 +1504,13 @@ msgstr "새로운 비밀 번호를 성공�으로 저장했습니다. 귀하는
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "별명"
 
@@ -1276,7 +1519,12 @@ msgstr "별명"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "별명� �미 사용중 입니다. 다른 별명� 시�해 보십시오."
 
@@ -1285,47 +1533,60 @@ msgstr "별명ì�´ ì�´ë¯¸ 사용중 입니다. 다른 별명ì�„ ì‹œë�„í•´ ë³´ì‹­ì
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "별명� 반드시 �소문�와 숫�로만 �루어져야 하며 스페�스� 사용� 불가 합니다."
+msgstr ""
+"별명� 반드시 �소문�와 숫�로만 �루어져야 하며 스페�스� 사용� 불가 합니"
+"다."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "별명 사용� 불가 합니다."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "따�가고 싶� 사용�� 별명"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "별명 �는 �메�"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "아니오"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Jabber ID가 아닙니다."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "허용�지 않는 요청입니다."
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "통신회사가 선� �지 않았습니다."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "코드가 입력 �지 않았습니다."
 
@@ -1337,11 +1598,15 @@ msgstr "확� 코드가 없습니다."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "내용� 없습니다!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "�메�� 추가 �지 않았습니다."
 
@@ -1350,7 +1615,9 @@ msgid "No id."
 msgstr "id가 없습니다."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "�메� 주소가 없습니다."
 
@@ -1361,6 +1628,7 @@ msgstr "리모트 사용�� 별명� 없습니다."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "별명� 없습니다."
 
@@ -1368,12 +1636,14 @@ msgstr "별명� 없습니다."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "취소 할 대기중� ��� 없습니다."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "휴대� 번호가 없습니다."
 
@@ -1383,7 +1653,8 @@ msgid "No profile URL returned by server."
 msgstr "서버로부터 제공�는 프로필 URL가 없습니다."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "그 사용�는 등�� 메�주소가 없습니다."
 
@@ -1395,7 +1666,7 @@ msgstr "리퀘스트가 없습니다!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "결과 없�"
 
@@ -1406,12 +1677,16 @@ msgstr "사�즈가 없습니다."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "그 ID로 발견� �태가 없습니다."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "발견� ID� �태가 없습니다."
 
@@ -1421,13 +1696,15 @@ msgid "No such OpenID."
 msgstr "그러한 OpenID는 없습니다."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "그러한 문서는 없습니다."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "그러한 통지는 없습니다."
 
@@ -1465,12 +1742,22 @@ msgstr "그러한 예약 구�� 없습니다."
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "그러한 사용�는 없습니다."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "그러한 �메� 주소나 계정� 가진 사용�는 없습니다."
 
@@ -1484,32 +1771,38 @@ msgid "Not a recovery code."
 msgstr "복구 코드가 아닙니다."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "가입� 사용�가 아닙니다."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "지�하는 형�� ��터가 아닙니다."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "유효한 Jabber ID가 아닙니다."
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "유효한 OpenID가 아닙니다."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "유효한 �메� 주소가 아닙니다."
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "유효한 �메� 주소가 아닙니다."
 
@@ -1517,6 +1810,11 @@ msgstr "유효한 �메� 주소가 아닙니다."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "유효한 별명� 아닙니다"
 
@@ -1536,7 +1834,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "유효한 프로필 URL� 아닙니다. (YADIS 문서가 없습니다)"
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "그림 파�� 아니거나 ��� 파� 입니다."
 
@@ -1547,11 +1846,13 @@ msgstr "��� �지 않았습니다."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "예�치 못한 반� 입니다."
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "찾지 못함"
 
@@ -1567,11 +1868,15 @@ msgstr "찾지 못함"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "로그�하고 있지 않습니다."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "구�하고 있지 않습니다!"
 
@@ -1588,39 +1893,44 @@ msgid "Notice feed for %s"
 msgstr "%s� 통지 피드"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "통지� 프로필� 없습니다."
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "통지"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s 태그� 통지"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "기존 비밀 번호"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "OpenID 계정 셋업"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "OpenID �� 로그�"
 
@@ -1628,29 +1938,34 @@ msgstr "OpenID �� 로그�"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "OpenID 로그�"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "OpenID 로� ��� 취소�었습니다."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID 로� ��� 실패 : %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID 장해 : %s"
@@ -1666,11 +1981,12 @@ msgid "OpenID settings"
 msgstr "OpenID 설정"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "초대장� 메시지 첨부하기."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "불완전한 업로드."
 
@@ -1680,34 +1996,46 @@ msgstr "불완전한 업로드."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "비밀 번호"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "비밀 번호가 �치하지 않습니다."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "비밀 번호는 6� ���어야 합니다."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "비밀 번호 복구가 요청�었습니다."
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "비밀 번호 저장"
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "비밀 번호가 �치하지 않습니다."
 
@@ -1727,14 +2055,17 @@ msgid "People search"
 msgstr "사람 찾기"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "개���"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "개��� 메시지"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "지역번호와 함께 �어쓰기 없� 번호를 �어 주세요."
 
@@ -1743,10 +2074,12 @@ 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 \"Cancel\"."
-msgstr "사용�� 통지를 구�하려면 �세를 확�해 주세요. 구�하지 않는 경우는, \"취소\"를 �릭해 주세요."
+msgstr ""
+"사용�� 통지를 구�하려면 �세를 확�해 주세요. 구�하지 않는 경우는, \"취소"
+"\"를 �릭해 주세요."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalk� �태가 변경�었� 때 통지를 보냅니다."
 
@@ -1755,7 +2088,9 @@ msgstr "Jabber/GTalk� �태가 변경�었� 때 통지를 보냅니다."
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "설정"
 
@@ -1764,42 +2099,52 @@ msgstr "설정"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "설정� 저장�었습니다."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "언어 설정"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "개�정보 취급방침"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "통지를 저장하는� 문제가 발�했습니다."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "프로필"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "프로필 URL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "프로필 세팅"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "알 수 없는 프로필"
 
@@ -1808,17 +2153,19 @@ msgid "Public Stream Feed"
 msgstr "�블릭 스트림 피드"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "�블릭 타임��"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Jabber/GTalk 계정� 위한 MicroID� �성"
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "�메� 주소를 위한 MicroID� �성"
 
@@ -1828,12 +2175,14 @@ msgid "Recent Tags"
 msgstr "최근 태그"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "복구"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "비밀 번호 복구"
 
@@ -1846,37 +2195,45 @@ msgstr "알 수 없는 취소를 위한 리커버리 코드"
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "회�가입"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "가입� 허용�지 않습니다."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "회� 가입� 성공�입니다."
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "거부"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "�� 로그�"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "리모트 프로필과 �치하는 것� 없습니다."
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "리모트 구� 예약"
 
@@ -1890,6 +2247,9 @@ msgstr "리모트 구� 예약"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "삭제"
 
@@ -1898,41 +2258,50 @@ msgstr "삭제"
 msgid "Remove OpenID"
 msgstr "OpenID 삭제"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
-msgstr "마지막 OpenID를 삭제하면, 로그� 할 수 없게 �니다! 삭제하기 전�, 다른 OpenID를 추가해 주십시오."
+msgstr ""
+"마지막 OpenID를 삭제하면, 로그� 할 수 없게 �니다! 삭제하기 전�, 다른 "
+"OpenID를 추가해 주십시오."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "답신"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "%s� 답신"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "초기화"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "비밀 번호 초기화"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "SMS 휴대� 번호"
 
@@ -1941,17 +2310,18 @@ msgstr "SMS 휴대� 번호"
 msgid "SMS Settings"
 msgstr "SMS 세팅"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "SMS ��"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "위와 같� 비밀 번호"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "위와 같� 비밀 번호. 필수 사항."
 
@@ -1964,12 +2334,21 @@ msgstr "위와 같� 비밀 번호. 필수 사항."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "저장"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "검색"
 
@@ -1979,63 +2358,78 @@ msgid "Search Stream Feed"
 msgstr "스트림 피드를 검색"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 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 "%%site.name%% � 통지를 내용으로부터 검색. 검색어는 스페�스로 구분한다; �어� 3글� �� 필요."
+msgstr ""
+"%%site.name%% � 통지를 내용으로부터 검색. 검색어는 스페�스로 구분한다; �어"
+"� 3글� �� 필요."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 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 "%%site.name%% � 사람� �름, 장소, �미로 검색. 검색어는 스페�스 구분한다; �어� 3글� �� 필요."
+msgstr ""
+"%%site.name%% � 사람� �름, 장소, �미로 검색. 검색어는 스페�스 구분한다; "
+"�어� 3글� �� 필요."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "통신 회사를 선� 하세요."
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "보내기"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "새로운 통지를 올리려면 � 주소로 메�� 보내십시오/"
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "새로운 예약 구�� 통지를 �메�로 보내주세요."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk 로 통지를 보내주세요."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
-msgstr "통지를 SMS로 보내주세요; 물론 통신사로부터 바가지 요금� 문다는 것� 알고 있습니다."
+msgstr ""
+"통지를 SMS로 보내주세요; 물론 통신사로부터 바가지 요금� 문다는 것� 알고 있"
+"습니다."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "내가 구�하지 않는 사람으로 부터� 답장�  Jabber/GTalk� 통해 보내주세요."
+msgstr ""
+"내가 구�하지 않는 사람으로 부터� 답장�  Jabber/GTalk� 통해 보내주세요."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "설정"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "설정 저장"
 
@@ -2055,27 +2449,32 @@ msgid "Something weird happened."
 msgstr "예측 하지 못한 사태가 발�했습니다."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "죄송합니다. �메�� 허용�지 않습니다."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "죄송합니다. 귀하� �메�� 아닙니다."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "소스 코드"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "통계"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "저장� OpenID를 찾� 수 없습니다."
 
@@ -2083,24 +2482,28 @@ msgstr "저장� OpenID를 찾� 수 없습니다."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "구�"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "구��"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "구� 허가"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "구� 거부"
 
@@ -2108,28 +2511,35 @@ msgstr "구� 거부"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "구�"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "파�� 올리는� 시스템 오류 발�"
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "태그"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "문�"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "문� 검색"
 
@@ -2149,6 +2559,7 @@ msgid "That confirmation code is not for you!"
 msgstr "그 �� 코드는 귀하� 것� 아닙니다!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "그 �메� 주소는 �미 다른 사용�� 소유입니다."
 
@@ -2158,63 +2569,73 @@ msgid "That file is too big."
 msgstr "파� 사�즈가 너무 �니다."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "그 Jabber ID는 �미 귀하� 것입니다."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "그 �메� 주소는 �미 귀하� 것입니다."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "그 휴대� 번호는 �미 귀하� 것입니다."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "그 Jabber ID는 귀하� 것� 아닙니다."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "그 �메� 주소는 귀하� 것� 아닙니다."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "그 휴대� 번호는 귀하� 것� 아닙니다."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "옳지 않� 메신저 계정 입니다."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "옳지 않� �� 번호 입니다."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "그 휴대� 번호는 �미 다른 사용�� 것입니다."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "너무 �니다. 통지� 최대 길�는 140글� 입니다."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "너무 �니다. 통지� 최대 길�는 255글� 입니다."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" 는 귀하� 계정으로 승��었습니다."
@@ -2223,74 +2644,90 @@ msgstr "\"%s\" 는 귀하� 계정으로 승��었습니다."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "주소가 삭제�었습니다."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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� 통과 �지 않았습니다. 웹사�트� 지시를 찾아 구� 승� 방법� 대하여 �어보십시오. "
-"귀하� 구� 토�� : "
+"구�� 승� �었습니다. 하지만 콜백 URL� 통과 �지 않았습니다. 웹사�트� 지"
+"시를 찾아 구� 승� 방법� 대하여 �어보십시오. 귀하� 구� 토�� : "
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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� 통과 �지 않았습니다. 웹사�트� 지시를 찾아 구� 해지 방법� 대하여 �어보십시오."
+"구�� 해지 �었습니다. 하지만 콜백 URL� 통과 �지 않았습니다. 웹사�트� 지"
+"시를 찾아 구� 해지 방법� 대하여 �어보십시오."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "%s� 통지를 받고 있는 사람"
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "귀하� 통지를 받고 있는 사람"
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s님� 받고 있는 통지� 사람"
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "귀하� 통지를 받고 있는 사람"
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr "�� 구� 신청� � 사용�:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "� �� 코드는 오래�습니다. 다시 발급 받아 주십시오."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
-msgstr "� 양�� ��으로 등��니다. ��으로 �지 않는 경우는, 등�� �릭해 주세요. OpenID 프로바��� 전송 �니다."
+msgstr ""
+"� 양�� ��으로 등��니다. ��으로 �지 않는 경우는, 등�� �릭해 주세"
+"요. OpenID 프로바��� 전송 �니다."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"%s 계정으로 최초 로그�입니다. OpenID와� 연결� 필요합니다. 계정� 새로 �성하거나 기존� 계정으로 연결 하실 수 있습니다."
+"%s 계정으로 최초 로그�입니다. OpenID와� 연결� 필요합니다. 계정� 새로 �성"
+"하거나 기존� 계정으로 연결 하실 수 있습니다."
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "� 메서드는 등� �는 삭제를 요구합니다."
 
@@ -2299,47 +2736,63 @@ msgstr "� 메서드는 등� �는 삭제를 요구합니다."
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "� 메서드는 등�� 요구합니다."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "� 페�지는 귀하가 승�한 미디어 타입�서는 �용할 수 없습니다."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "타임존"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "타임존� 설정 �지 않았습니다."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: 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 ""
-"구�하려면, [로그�](%%action.login%%)하거나, 새 계정� [등�](%%action.register%%)하십시오. �미 "
-"계정� [호환�는 마��로블로깅 사�트]((%%doc.openmublog%%)� 계정� 있으면, 아래� 프로파� URL� 입력하십시오."
+"구�하려면, [로그�](%%action.login%%)하거나, 새 계정� [등�](%%action."
+"register%%)하십시오. �미 계정� [호환�는 마��로블로깅 사�트]((%%doc."
+"openmublog%%)� 계정� 있으면, 아래� 프로파� URL� 입력하십시오."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "� 개� 사용� ID나 대화명� 입력해야 합니다."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "귀하� 홈페�지, 블로그 혹� 다른 사�트� 프로필 페�지 URL"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "다른 마��로블로깅 서비스� 귀하� 프로필 URL"
 
@@ -2351,15 +2804,22 @@ msgstr "다른 마��로블로깅 서비스� 귀하� 프로필 URL"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "잘못� � 제출"
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "잘못� 비밀 번호 지정"
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "알려지지 않� 행�"
 
@@ -2372,7 +2832,9 @@ msgstr "OMB 프로토콜� 알려지지 않� 버전"
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
-msgstr "따로 지정하지 않는다면, � 사�트� 내용� 저작권� 작성한 사람�게 있으며 다� ��선스로 �용할 수 있습니다: "
+msgstr ""
+"따로 지정하지 않는다면, � 사�트� 내용� 저작권� 작성한 사람�게 있으며 다"
+"� ��선스로 �용할 수 있습니다: "
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #: actions/confirmaddress.php:90
@@ -2388,38 +2850,47 @@ msgstr "구� 해제"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "지��지 않는 OMB 버전"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "지�하지 않는 그림 파� 형�입니다."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "SMS� �한 업��트"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "�스턴트 메신저� �한 업��트"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%1$s � %2$s� 있는 친구들� 업��트!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s� 있는 %1$s� 업��트!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "올리기"
 
@@ -2430,20 +2901,24 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"여기� 새 아바타�미지를 올려보세요. 업로드후�는 사진� 편집할 수 없습니다. 사�즈 �역� 늘리거나 줄� 수 있습니다. 그것� 사�트� "
-"��선스하� 있게�니다. 당신� 소유�면서 공유하고 싶� 사진� �용해보세요."
+"여기� 새 아바타�미지를 올려보세요. 업로드후�는 사진� 편집할 수 없습니다. "
+"사�즈 �역� 늘리거나 줄� 수 있습니다. 그것� 사�트� ��선스하� 있게�"
+"니다. 당신� 소유�면서 공유하고 싶� 사진� �용해보세요."
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
 msgstr "새 프로필 사진 올리기"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "다� 양�� �용해 친구와 �료를 � 서비스� 초대하십시오."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "업��트나 공지, 비밀번호 찾기� 사용하세요."
 
@@ -2467,11 +2942,16 @@ msgstr "살펴 보고 있는 사용�가 없습니다."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "�용�가 프로필� 가지고 있지 않습니다."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "�용� 닉네임"
 
@@ -2480,29 +2960,33 @@ msgid "User not found."
 msgstr "�용�가 없습니다."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "당신� 주로 �활하는 곳� 어떤 타임존입니까?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "�하세요? %?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "당신� 어디� 삽니까? \"시, � (or 군,구), 나�"
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "%S 잘못� 그림 파� 타입입니다. "
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "%S 잘못� 그림 파� 사�즈입니다."
@@ -2510,7 +2994,9 @@ msgstr "%S 잘못� 그림 파� 사�즈입니다."
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "네, 맞습니다."
 
@@ -2523,7 +3009,8 @@ msgstr "당신� �미 오픈ID를 가지고 있습니다."
 msgid ""
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
-msgstr "�구�으로 게시글� 삭제하려고 합니다. 한번 삭제�면, 복구할 수 없습니다."
+msgstr ""
+"�구�으로 게시글� 삭제하려고 합니다. 한번 삭제�면, 복구할 수 없습니다."
 
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 #: actions/recoverpassword.php:36
@@ -2531,11 +3018,12 @@ msgid "You are already logged in!"
 msgstr "당신� �미 로그��어 있습니다."
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "당신� 다� 사용�를 �미 구�하고 있습니다."
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "당신� 지정한 회�과 친구가 아닙니다."
 
@@ -2551,46 +3039,56 @@ msgstr "계정ì�„ 새로 만들면 새로운 게시글ì�„ 작성할 수 있습ë‹
 #: actions/smssettings.php:69
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "당신� %%site.name%% 로부터 �메�� 통해 SMS메시지를 받� 수 있습니다."
+msgstr ""
+"당신� %%site.name%% 로부터 �메�� 통해 SMS메시지를 받� 수 있습니다."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
-msgstr "당신� \"Remove\"로 표기� 버튼�릭� 통해 계정�서 오픈ID를 제거할 수 있습니다."
+msgstr ""
+"당신� \"Remove\"로 표기� 버튼�릭� 통해 계정�서 오픈ID를 제거할 수 있습니"
+"다."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"당신� Jabber나 구글토�(%%doc.im%%)를 통해 메시지를 주고받� 수 있습니다. 아래 당신� 주소와 환경설정� 조정하세요."
+"당신� Jabber나 구글토�(%%doc.im%%)를 통해 메시지를 주고받� 수 있습니다. 아"
+"래 당신� 주소와 환경설정� 조정하세요."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
-msgstr "사람들� 당신� 대해 좀 � 잘 알 수 있�� 여기 당신� 개� 프로필� 업��트 할 수 있습니다. "
+msgstr ""
+"사람들� 당신� 대해 좀 � 잘 알 수 있�� 여기 당신� 개� 프로필� 업��"
+"트 할 수 있습니다. "
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "당신� 로컬 구�� 사용할 수 있습니다."
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "��선스� ��하지 않는다면 등�할 수 없습니다."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "당신� 프로필� 우리�게 전송하지 않았다."
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2602,89 +3100,104 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
-"�스팅 주소는 %1$s입니다.새 메시지를 등�하려면 %2$ 주소로 �메�� 보내십시오.�메� 사용법� %3$s 페�지를 "
-"보십시오.안녕히,%4$s"
+"�스팅 주소는 %1$s입니다.새 메시지를 등�하려면 %2$ 주소로 �메�� 보내십시"
+"오.�메� 사용법� %3$s 페�지를 보십시오.안녕히,%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "당신� 다른 사용�� �태를 삭제하지 않아� �다."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "로그�� 해야 다른 사용�를 %s� 초대할 수 있습니다."
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
-"당신� 초대를 받� 사람들� 수�하고, 사�트� 등�할때 공지를 받� 수 있습니다. 커뮤니티를 키워주셔서 대단히 �사합니다. ^^"
+"당신� 초대를 받� 사람들� 수�하고, 사�트� 등�할때 공지를 받� 수 있습니"
+"다. 커뮤니티를 키워주셔서 대단히 �사합니다. ^^"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "당신� ���었습니다. 아래 새 비밀번호를 입력하세요."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "당신� 오픈ID URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "� 서버�서 당신� 닉네임 혹� 당신� 등�� �메�주소"
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[오픈ID](%%doc.openid%%)는 당신� ��한 계정으로 많� 사�트� 로그�할 수 있게 해�니다. 여기�서 당신� 관련� "
-"오픈ID를 관리하세요."
+"[오픈ID](%%doc.openid%%)는 당신� ��한 계정으로 많� 사�트� 로그�할 수 "
+"있게 해�니다. 여기�서 당신� 관련� 오픈ID를 관리하세요."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "몇 초 전"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "%d� 전"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d시간 전"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d분 전"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "%d달 전"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "하루 전"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "1분 전"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "1달 전"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "1ë…„ ì „"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "1시간 전"
 
@@ -2706,12 +3219,14 @@ msgid "reply"
 msgstr "답장"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "위 비밀번호와 ��하게"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "지�하지 않는 종류� 파�입니다"
 
@@ -2732,6 +3247,26 @@ msgstr "<< 뒤�"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "세션토�� 문제가 있습니다. 다시 시�해주세요."
 
@@ -2740,6 +3275,7 @@ msgid "This notice is not a favorite!"
 msgstr "� 메시지는 favorite� 아닙니다."
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "favorite� 삭제할 수 없습니다."
 
@@ -2747,22 +3283,28 @@ msgstr "favorite� 삭제할 수 없습니다."
 msgid "Favor"
 msgstr "좋아합니다"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "누군가 내 글� 좋아하는 게시글로 추가했�때, �메�� 보냅니다."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "누군가 내게 비밀메시지를 보냈�때, �메�� 보냅니다."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "� 게시글� �미 좋아하는 게시글입니다."
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "좋아하는 게시글� �성할 수 없습니다."
 
@@ -2772,11 +3314,13 @@ msgstr "좋아하는 게시글 취소"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s 좋아하는 게시글"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "%s� 좋아하는 게시글� 피드"
@@ -2818,33 +3362,45 @@ msgid "Login with your username and password. "
 msgstr "당신� 계정과 비밀번호로 로그�하세요."
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "메시지가 너무 길어요. 최대로 140�까지 입력하실 수 있습니다."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "수신�를 지정하지 않았습니다."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "당신� � 사용��게 메시지를 보낼 수 없습니다."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "�신�게 메시지를 보내지 마세요. 대신 조용하게 스스로�게 그것� �하세요;;"
+msgstr ""
+"�신�게 메시지를 보내지 마세요. 대신 조용하게 스스로�게 그것� �하세요;;"
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "그러한 사용�가 없습니다."
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "새로운 메시지입니다."
 
@@ -2855,7 +3411,8 @@ msgstr "프로필매칭 없� 바로 글� �니다."
 #: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[오픈ID](%%doc.openid%%) 는 당신� 많� 사�트� 로그�할 수 있게 합니다."
+msgstr ""
+"[오픈ID](%%doc.openid%%) 는 당신� 많� 사�트� 로그�할 수 있게 합니다."
 
 #: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
@@ -2898,6 +3455,11 @@ msgstr "당신� 여기� 당신� 개��� 프로필� 업��트 할
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "프로필 매칭� 없는 사용�"
 
@@ -2926,6 +3488,8 @@ msgid "New password successfully saved. "
 msgstr "새 비밀번호를 성공�으로 저장했습니다."
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "비밀번호는 6�리 ���어야 합니다."
 
@@ -2934,7 +3498,9 @@ msgstr "비밀번호는 6�리 ���어야 합니다."
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
-msgstr "축하합니다 %s님!! %%%%site.name%%%%� 오신걸 환�합니다. 다�과 같� �� 하실 수 있습니다..."
+msgstr ""
+"축하합니다 %s님!! %%%%site.name%%%%� 오신걸 환�합니다. 다�과 같� �� 하"
+"실 수 있습니다..."
 
 #: actions/register.php:227
 msgid "(You should receive a message by email momentarily, with "
@@ -2946,12 +3512,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "구�하기 위해 당신� 로그�할 수 있습니다. (%%action,login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "%s� 좋아하는 게시글� 위한 피드"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "좋아하는 게시글� 복구할 수 없습니다."
 
@@ -2959,7 +3528,7 @@ msgstr "좋아하는 게시글� 복구할 수 없습니다."
 msgid "No such message."
 msgstr "그러한 메시지가 없습니다."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "오� 발송�가 수신�가 � 메시지를 �는것� 좋습니다."
 
@@ -2983,51 +3552,70 @@ msgid "Mobile carrier for your phone. "
 msgstr "당신� �� 위한 모바� 전송"
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "%s�게 �접 메시지"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "%s�게 모든 �접 메시지"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "당신� 보낸 �접 메시지"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s�서 보낸 모든 �접 메시지"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "메시지 내용� 없습니다!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "받는 사용�가 없습니다."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "당신� 친구가 아닌 사용��게 �접 메시지를 보낼 수 없습니다."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / %s� 좋아하는 글들"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s 좋아하는 글� 업��트 �습니다. %S� �해 / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s님� 당신� 게시글� 좋아하는 글로 추가했습니다."
@@ -3045,17 +3633,22 @@ msgstr ""
 #: actions/twittersettings.php:27
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
-msgstr "당신� 트위터 계정� 추가하세요. ���으로 당신� 메시지를 트위터� 전송합니다."
+msgstr ""
+"당신� 트위터 계정� 추가하세요. ���으로 당신� 메시지를 트위터� 전송합니"
+"다."
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "트위터 환경설정"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "트위터 계정"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "현재 유효한 트위터 계정"
 
@@ -3064,6 +3657,7 @@ msgid "Twitter Username"
 msgstr "트위터 사용��름"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "공백� 없애주세요."
 
@@ -3072,24 +3666,31 @@ msgid "Twitter Password"
 msgstr "트위터 비밀번호"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "��으로 트위터� 게시글� 보냅니다."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "트위터� 로컬 \"@\"답장으로 보냅니다."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "여기�서 내 트위터 친구들� 구�합니다."
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
-msgstr "사용� �름� 단지 숫��거나, 대소문�, 그리고 언�바(_)로 구성�어야 하고, 최대 15� �내�어야 합니다."
+msgstr ""
+"사용� �름� 단지 숫��거나, 대소문�, 그리고 언�바(_)로 구성�어야 하고, "
+"최대 15� �내�어야 합니다."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "트위터 �격� �명할 수 없습니다."
 
@@ -3100,33 +3701,43 @@ msgstr "트위터로부터 \"%s\"를 위한 계정정보를 불러올 수 없습
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "트위터 환경설정� 저장할 수 없습니다."
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "트위터 환결설정� 저장�었습니다."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "�것� 당신� 트위터 계정� 아닙니다."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "트위터 사용�를 제거할 수 없습니다."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "트위터 계정� 제거�었습니다."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "트위터 환경설정� 저장할 수 없습니다."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "트위터 환경설정� 저장�었습니다."
 
@@ -3134,29 +3745,28 @@ msgstr "트위터 환경설정� 저장�었습니다."
 msgid "Please check these details to make sure "
 msgstr "� �세설정들� 체�해주세요."
 
-# FIXME: 잘못 추출� 문�열, 번역할 필요 없�.
 #: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
 msgstr "가입� 승��었습니다."
 
-# FIXME: 잘못 추출� 문�열, 번역할 필요 없�.
 #: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr "� 구�� 거절�었습니다."
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "실행결과"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "실행 완료"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "실행 실패"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "죄송합니다. � 명령� 아� 실행�지 않았습니다."
 
@@ -3166,89 +3776,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "구�: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "�용�� 지��� 게시글� 없습니다."
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "게시글� 좋아하는 글로 지정�었습니다."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "전체�름: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "위치: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "홈페�지: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "�기소개: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "당신� 보낸 메시지가 너무 길어요. 최대 140글�까지입니다."
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "%s�게 보낸 �접 메시지"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "�접 메시지 보내기 오류."
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "구�하려는 사용�� �름� 지정하십시오."
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "%s�게 구��었습니다."
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "구�� 해제하려는 사용�� �름� 지정하십시오."
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "%s�서 구�� 해제했습니다."
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "명령� 아� 실행�지 않았습니다."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "알림�기."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "알림� � 수 없습니다."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "알림� 켜졌습니다."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "알림� 켤 수 없습니다."
 
@@ -3256,11 +3888,11 @@ msgstr "알림� 켤 수 없습니다."
 msgid "Commands:\n"
 msgstr "명령: \n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "메시지를 삽입할 수 없습니다."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "새 URI와 함께 메시지를 업��트할 수 없습니다."
 
@@ -3277,7 +3909,7 @@ msgstr ""
 "당신� %1$s� 새 �스팅 주소를 가진다. \n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "%s로부터 새로운 비밀 메시지가 �착하였습니다."
@@ -3291,7 +3923,7 @@ msgstr ""
 "%1$s(%2$s)님� 당신�게 비밀 메시지를 보냈습니다 : \n"
 " \n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "오� 해당 사용�만 �신� 메�박스를 열람할 수 있습니다."
 
@@ -3300,31 +3932,39 @@ msgid "This form should automatically submit itself. "
 msgstr "� 양�� ���으로 스스로 제출�니다."
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "좋아하는 글들"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s 님� 좋아하는 글들"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "�용�"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "받� 쪽지함"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "당신� 받� 메시지들"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "보낸 쪽지함"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "당신� 보낸 메시지들"
 
@@ -3337,14 +3977,19 @@ msgid "Twitter integration options"
 msgstr "트위터 통합옵션"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "�게"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "메시지를 분리할 수 없습니다."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s 와 친구들, %d 페�지"
@@ -3354,21 +3999,31 @@ msgid "You can upload your personal avatar."
 msgstr "당신� 개��� 아바타를 업로드할 수 있습니다."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "아바타 설정"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "�래 설정"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "미리보기"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "�르기"
 
@@ -3385,34 +4040,43 @@ msgid "There was a problem with your session token. "
 msgstr "당신� 세션토�� 문제가 있습니다."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "당신� 아바타가 � �미지�역� 지정하세요."
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "파� ��터를 잃어버렸습니다."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "파�� 잃어버렸습니다."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "알 수 없는 종류� 파�입니다"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "프로필� 지정하지 않았습니다."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "해당 ID� 프로필� 없습니다."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "사용�를 차단합니다."
 
@@ -3420,15 +4084,14 @@ msgstr "사용�를 차단합니다."
 msgid "Are you sure you want to block this user? "
 msgstr "� 사용�를 차단하고 싶� 게 맞습니까?"
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "당신� �미 � 사용�를 차단하고 있습니다."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "정보차단� 저장하는� 실패했습니다."
 
-# FIXME: 잘못 추출� 문�열, 번역할 필요 없�.
 #: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been "
@@ -3442,38 +4105,56 @@ msgstr "당신� �구�으로 � 게시글� 삭제하려고 합니다."
 msgid "Add to favorites"
 msgstr "좋아하는 게시글로 추가하기"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "%s 그룹 편집"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr "받�쪽지함� 그룹� �할 수 있�� 활성화�어야 한다."
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "그룹� 만들기 위해서는 로그�해야 합니다."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "닉네임� 없습니다"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "그러한 그룹� 없습니다."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "관리�만 그룹� 편집할 수 있습니다."
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "다� 양�� �용해 그룹� 편집하십시오."
 
@@ -3482,14 +4163,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr "닉네임� 오� �문소문��어야 합니다."
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "설명� 너무 길어요. (최대 140글�)"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "그룹� 업��트 할 수 없습니다."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "옵션들� 저장�었습니다."
 
@@ -3506,7 +4188,8 @@ msgstr "�스팅� 위해 새 �메� 주소를 만드세요."
 msgid "Send me email when someone "
 msgstr "내게 �메�� 보내세요."
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "친구들� 내게 �메��나 쪽지를 보낼 수 있�� 허용합니다."
 
@@ -3518,7 +4201,7 @@ msgstr "해당 �메� 주소는 �미 등��어있습니다."
 msgid "A confirmation code was sent to the email address you added. "
 msgstr "��코드가 당신� 추가한 �메�주소로 발송�었습니다"
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "서버�러입니다. - 사용� 정보를 불러올 수 없습니다."
 
@@ -3532,51 +4215,66 @@ msgstr "만약 당신� �� 업��트를 위해 %s 애플리케�션�
 msgid "Allow %s to update my Facebook status"
 msgstr "내 페�스� �태� 업��트를 위해 %s를 허용합니다."
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "통과! (넘어갑니다)"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr "게시글� 없습니다."
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "페�지수"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "뒷 페�지"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "앞 페�지"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "%s 사용� 위해 친구초대를 해주셔서 대단히 �사합니다."
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "초대장� 무사히 발송�었습니다."
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "당신� %s� 초대�었습니다."
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr "%s �용� 위해 당신� 친구를 초대하세요."
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "친구들� �미 %s를 사용중입니다."
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "초대장� 발송합니다."
@@ -3618,12 +4316,14 @@ msgstr "만약 당신� ��업��트를 위해  %s를 좋아한다면"
 msgid "Sync preferences"
 msgstr "싱� 설정"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "좋아하는글 취소"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "�기있는 게시글"
 
@@ -3637,7 +4337,8 @@ msgid "The most popular notices on the site right now."
 msgstr "사�트�서 지금 가장 �기있는 게시글"
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "�기있는 회�"
 
@@ -3651,15 +4352,17 @@ msgstr "�기있는 회�, %d페�지"
 msgid "A selection of some of the great users on %s"
 msgstr "%s� 훌륭한 회�� �부 선�"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "� 회�� 구�으로부터 당신� 차단해왔다."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "ID가 없습니다."
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "그룹 로고"
 
@@ -3667,11 +4370,13 @@ msgstr "그룹 로고"
 msgid "You can upload a logo image for your group."
 msgstr "당신그룹� 로고 �미지를 업로드할 수 있습니다."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "로고를 업��트했습니다."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "로고 업��트� 실패했습니다."
 
@@ -3690,7 +4395,8 @@ msgid "A list of the users in this group."
 msgstr "� 그룹� 회�리스트"
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "그룹"
 
@@ -3705,6 +4411,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "%%%%site.name%%%% 그룹� 당신�게 얘기할 사람� 찾게해�니다."
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "새 그룹� 만듭니다."
 
@@ -3714,7 +4421,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr "�름과 위치, �세설명으로 %%site.name%% �서 그룹� 찾습니다."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "그룹 찾기"
 
@@ -3736,20 +4443,20 @@ msgstr "Jabber/GTalk(구글토�)를 통해 내게 답장� 보냅니다."
 msgid "A confirmation code was sent "
 msgstr "��코드가 보내졌습니다."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "그룹가입� 위해서는 로그�� 필요합니다."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "당신� �미 � 그룹� 멤버입니다."
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr "그룹 %s� %s는 가입할 수 없습니다."
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s 는 그룹 %s� 가입했습니다."
@@ -3758,15 +4465,18 @@ msgstr "%s 는 그룹 %s� 가입했습니다."
 msgid "Inboxes must be enabled for groups to work."
 msgstr "받�쪽지함� 그룹� �하기 위해 수신가능해야 합니다."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "그룹� 떠나기 위해서는 로그�해야 합니다."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "그러한 그룹� 없습니다."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "당신� 해당 그룹� 멤버가 아닙니다."
 
@@ -3774,21 +4484,25 @@ msgstr "당신� 해당 그룹� 멤버가 아닙니다."
 msgid "You may not leave a group while you are its administrator."
 msgstr "당신� 관리���안 해당 그룹� 떠나지 않는것� 좋습니다."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr "멤버십 기�� 발견할 수 없습니다."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "그룹 %s�서 %s 사용�를 제거할 수 없습니다."
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s가 그룹%s를 떠났습니다."
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "사�트� 로그�하세요."
 
@@ -3800,15 +4514,17 @@ msgstr "현재 �태가 없습니다."
 msgid "New group"
 msgstr "새로운 그룹"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "새 그룹� 만들기 위해 � 양�� 사용하세요."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "새 그룹� 만들 수 없습니다."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr "그룹 맴버십� 세팅할 수 없습니다."
 
@@ -3820,18 +4536,22 @@ msgstr "너무 길어요."
 msgid "Don't send a message to yourself; "
 msgstr "�신�게 메시지를 전송하지 �아주세요."
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "게시글� 등��었습니다."
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Ajax �러입니다."
 
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr "� 사용�는 nudge를 허용하지 않았고, 아� 그� �메�� ��하지 않았습니다."
+msgstr ""
+"� 사용�는 nudge를 허용하지 않았고, 아� 그� �메�� ��하지 않았습니다."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -3841,7 +4561,7 @@ msgstr "찔러 보기를 보냈습니다."
 msgid "Nudge sent!"
 msgstr "찔러 보기를 보냈습니다!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr "OpenID 로그�"
 
@@ -3865,11 +4585,13 @@ msgstr "URL �� 줄�기"
 msgid "Service"
 msgstr "서비스"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "사용할 URL �� 줄�기 서비스"
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL 줄�기 서비스 너무 �니다. (최대 50글�)"
 
@@ -3877,16 +4599,17 @@ msgstr "URL 줄�기 서비스 너무 �니다. (최대 50글�)"
 msgid "Change your password."
 msgstr "비밀번호를 변경하세요."
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr "비밀번호 변경"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr "유효한 태그가 아닙니다: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "�용� 셀프 테� %s - %d 페�지"
@@ -3896,11 +4619,12 @@ msgstr "�용� 셀프 테� %s - %d 페�지"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "� 사람들� 그들 스스로가 \"%s\" 태그를 추가했습니다."
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "프로필 정보"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "당신� 위한 태그, (문�,숫�,-, ., _로 구성) 콤마 혹� 공백으로 구분."
@@ -3910,20 +4634,25 @@ msgid "Automatically subscribe to whoever "
 msgstr "누구�게나 ��구�"
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "유효하지 않�태그: \"%s\""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "태그를 저장할 수 없습니다."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "공개 타임��, %d 페�지"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "공개 stream� 불러올 수 없습니다."
 
@@ -3933,8 +4662,8 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"%%site.name%% 는 마��로블로깅(http://en.wikipedia.org/wiki/Micro-blogging) 서비스 "
-"입니다."
+"%%site.name%% 는 마��로블로깅(http://en.wikipedia.org/wiki/Micro-blogging) "
+"서비스 입니다."
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -3945,11 +4674,13 @@ msgstr "공개 태그 ��우드"
 msgid "These are most popular recent tags on %s "
 msgstr "다�� %�서 가장 �기 있는 최근 태그입니다."
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "태그 ��우드"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "죄송합니다. 단지 초대� 사람들만 등�할 수 있습니다."
 
@@ -3998,7 +4729,8 @@ msgstr "(당신� �메�로 메시지를 받아야 합니다."
 msgid "That's a local profile! Login to subscribe."
 msgstr "그것� 로컬프로필입니다. 구�� 위해서는 로그�하십시오."
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "%s� 답장, %d 페�지"
@@ -4008,50 +4740,71 @@ msgstr "%s� 답장, %d 페�지"
 msgid "%s favorite notices, page %d"
 msgstr "%s 좋아하는 게시글, %d 페�지"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s 그룹"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s 그룹, %d 페�지"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "그룹 프로필"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr "설명"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "그룹 행�"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr "%s 그룹� 위한 공지피드"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "회�"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(없습니다.)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "모든 회�"
 
@@ -4061,14 +4814,14 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** 는 %%%%site.name%%%% [마��로블로깅)(http://en.wikipedia.org/wiki/Micro-"
-"blogging)� 사용� 그룹입니다. "
+"**%s** 는 %%%%site.name%%%% [마��로블로깅)(http://en.wikipedia.org/wiki/"
+"Micro-blogging)� 사용� 그룹입니다. "
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
 msgstr "오� 보내는 사람과 받는 사람"
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, %d 페�지"
@@ -4078,30 +4831,37 @@ msgid "'s profile"
 msgstr "'� 프로필"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "�용� 프로필"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "사진"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "사용� �작"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "� 회��게 �접 메시지를 보냅니다."
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "메시지"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "모든 구��"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "모든 그룹"
 
@@ -4111,8 +4871,8 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s**는 %%%%site.name%%%% [마��로블로깅](http://en.wikipedia.org/wiki/Micro-"
-"blogging) 서비스� 계정� 갖고 있습니다."
+"**%s**는 %%%%site.name%%%% [마��로블로깅](http://en.wikipedia.org/wiki/"
+"Micro-blogging) 서비스� 계정� 갖고 있습니다."
 
 #: actions/smssettings.php:128
 msgid "Phone number, no punctuation or spaces, "
@@ -4126,7 +4886,7 @@ msgstr "SMS를 통해 게시글� 내게 보냅니다."
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "추가한 전화 번호로 �� 코드를 보냈습니다."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "휴대전화 사업�"
 
@@ -4184,16 +4944,17 @@ msgstr "게시글 쓰는 사람들"
 msgid "These are the people whose "
 msgstr "하는 사람들"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "%s 으로 태그� 게시글, %d 페�지"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "가장 최근� \"%s\" 으로 태그� 메시지들"
@@ -4215,26 +4976,29 @@ msgstr "태그 %s"
 msgid "Tag user"
 msgstr "태그 사용�"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
-msgstr "사용�를 위한 태그 (문�,숫�, -, . ,그리고 _), 콤마 혹� 공백으로 분리하세요."
+msgstr ""
+"사용�를 위한 태그 (문�,숫�, -, . ,그리고 _), 콤마 혹� 공백으로 분리하세"
+"ìš”."
 
 #: actions/tagother.php:164
 msgid "There was a problem with your session token."
 msgstr "당신� 세션토�관련 문제가 있습니다."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
-msgstr "당신� 구�하거나 당신� 구�하는 사람들� 대해서만 태그를 붙� 수 있습니다."
+msgstr ""
+"당신� 구�하거나 당신� 구�하는 사람들� 대해서만 태그를 붙� 수 있습니다."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "태그를 저장할 수 없습니다."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "당신� 구��나 구�하는 사람� 태깅� 위해 � 양�� 사용하세요."
 
@@ -4242,20 +5006,23 @@ msgstr "당신ì�˜ 구ë�…ìž�나 구ë�…하는 사람ì—� 태깅ì�„ 위해 ì�´ ì–‘ì‹
 msgid "No such tag."
 msgstr "그러한 태그가 없습니다."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "마��로블로그는  %s 으로 태그�었습니다."
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "사용� 차단� 실패했습니다."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "사용� 차단 해제� 실패했습니다."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "찾� 수가 없습니다."
 
@@ -4263,15 +5030,16 @@ msgstr "찾� 수가 없습니다."
 msgid "Add your Twitter account to automatically send "
 msgstr "��으로 보내려면 트위터 계정� 추가하십시오."
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "트위터 사용� �름"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "트위터 비밀번호"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "트위터 친구들"
 
@@ -4284,143 +5052,154 @@ msgstr "Username� 단지 숫�를 가져야 합니다,"
 msgid "Unable to retrieve account information "
 msgstr "계정정보를 불러올 수 없습니다."
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "차단 제거 �러!"
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "요청한 프로필id가 없습니다."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "해당 id� 프로필� 없습니다."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "구�취소 �었습니다."
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "%s 그룹"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s 그룹, %d 페�지"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "게시글 저장문제. 알려지지않� 회�"
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
-msgstr "너무 많� 게시글� 너무 빠르게 올�옵니다. 한숨고르고 몇분후� 다시 �스트를 해보세요."
+msgstr ""
+"너무 많� 게시글� 너무 빠르게 올�옵니다. 한숨고르고 몇분후� 다시 �스트를 "
+"해보세요."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "� 사�트� 게시글 �스팅으로부터 당신� 금지�었습니다."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "아바타를 업로드하세요."
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "기타"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "다른 옵션들"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "제목없는 페�지"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "주 사�트 네비게�션"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "개� 프로필과 친구 타임��"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "프로필�나 �스트 검색"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "계정"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "당신� �메�, 아바타, 비밀 번호, 프로필� 변경하세요."
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "IM, SMS, 트위터� 연결하기"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "� 사�트로부터 로그아웃"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "� 사�트 로그�"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "계정 만들기"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "오픈ID로 로그�하기"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "�움� 필요해!"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr "사�트 공지"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "로컬 뷰"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr "페�지 공지"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "보조 사�트 네비게�션"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "�코니카 소프트웨어 ��선스"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "모든 것"
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "��선스"
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "� 사용� 차단하기"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "차단하기"
 
@@ -4433,11 +5212,14 @@ msgstr "� 게시글 좋아하기 취소"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "당신� 필요한 페�스� 어플리케�션 %s� 사용� 위해서 로그�하세요."
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr "새로운 계정"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "발행�었습니다."
 
@@ -4457,31 +5239,36 @@ msgstr "태그 필터�하기"
 msgid "All"
 msgstr "모든 것"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "태그"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "�� 리스트�서 태그 선�하기"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Go "
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "그룹 혹� 토픽� 홈페�지나 블로그 URL"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "설명"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "140글�로 그룹�나 토픽 설명하기"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "그룹� 위치, \"시/군/구, �, 나�\""
@@ -4490,20 +5277,20 @@ msgstr "그룹� 위치, \"시/군/구, �, 나�\""
 msgid "Group"
 msgstr "그룹"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "관리�"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "%s 그룹 �성 편집"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "로고"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "%s logo 추가 혹� 수정"
@@ -4521,7 +5308,6 @@ msgstr "가장 많� 게시글� 있는 그룹들"
 msgid "Tags in %s group's notices"
 msgstr "%s 그룹 게시글� 태그"
 
-# FIXME: 잘못 추출� 문�열, 번역할 필요 없�.
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a "
 msgstr "� 페�지는 귀하가 승�한 미디어 타입�서는 �용할 수 없습니다."
@@ -4534,11 +5320,11 @@ msgstr "가입"
 msgid "Leave"
 msgstr "떠나기"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "사용� �름과 비밀번호로 로그�"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "새 계정� 위한 회�가입"
 
@@ -4560,17 +5346,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s 는 지금 듣고 있습니다."
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "위치: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "홈페�지: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4579,56 +5365,62 @@ msgstr ""
 "소개: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s 사용�가 찔러 봤습니다."
 
-# FIXME: 잘못 추출� 문�열, 번역할 필요 없�.
 #: lib/mail.php:465
 #, php-format
 msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr "%1$s (%2$s) 사용�가 요즘� 무엇� 하는지 �금해 하고, "
 
-# FIXME: 잘못 추출� 문�열, 번역할 필요 없�.
 #: lib/mail.php:555
 #, php-format
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s 사용�가 %2$s� 귀하� 글� 추가했습니다."
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "로 부터"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "�접 메시지 보내기"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "게시글 보내기"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "사용 가능한 글�"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "� 게시글� 대한 답장"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "� 게시글� 대해 답장하기"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "답장하기"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "� 게시글 삭제하기"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "삭제"
 
@@ -4649,27 +5441,29 @@ msgstr "� 사용��게 찔러 보기 메시지 보내기"
 msgid "Tags in %s's notices"
 msgstr "%s� 게시글� 태그"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(없습니다)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "공개"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "사용� 그룹"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "최근 태그"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "피���"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "�기있는"
 
@@ -4685,31 +5479,33 @@ msgstr "� 사�트�서 그룹 찾기"
 msgid "Untitled section"
 msgstr "제목없는 섹션"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s 사람들� 구�합니다."
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "%s� �해 구��는 사람들"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s 그룹들�  � 멤버입니다."
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%s� 친구를 가입시키기 위해 친구와 �료를 초대합니다."
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "회�� 당신� 차단해왔습니다."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "� 회�� 구�합니다."
 
@@ -4722,10 +5518,11 @@ msgid "Top posters"
 msgstr "�위 게시글 등��"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "� 사용�를 차단해제합니다."
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "차단해제"
 
@@ -4733,5 +5530,2051 @@ msgstr "차단해제"
 msgid "Unsubscribe from this user"
 msgstr "� 사용�로부터 구�취소합니다."
 
-#~ msgid "Email address"
-#~ msgstr "�메� 주소"
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s� 친구들� 위한 피드"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s� 친구들� 위한 피드"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s� 친구들� 위한 피드"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s � 친구들"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "당신� 개��� 아바타를 업로드할 수 있습니다."
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "아바타가 업��트 �었습니다."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 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:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "세션토�� 문제가 있습니다. 다시 시�해주세요."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "누군가 내게 비밀메시지를 보냈�때, �메�� 보냅니다."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "당신그룹� 로고 �미지를 업로드할 수 있습니다."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "당신� 아바타가 � �미지�역� 지정하세요."
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "%s� 마��로블로그"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"%%site.name%% � 사람� �름, 장소, �미로 검색. 검색어는 스페�스 구분한다; "
+"�어� 3글� �� 필요."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "�접 메시지 보내기 오류."
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "스트림�서 \"%s\" 검색"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"보안� 위해 세팅� 저장하기 전� 계정과 비밀 번호를 다시 입력 해 주십시오."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "�블릭 스트림 피드"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "�블릭 스트림 피드"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "�블릭 스트림 피드"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "다� 개�정보 제외: 비밀 번호, 메� 주소, 메신저 주소, 전화 번호"
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "�성"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "그룹 프로필"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "'� 프로필"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s� 통지 피드"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s� 통지 피드"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s� 통지 피드"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "%s� 보낸쪽지함"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "아바타"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "프로필 세팅"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"추가한 휴대�으로 �� 코드를 보냈습니다. 수신함(�는 스팸함)� 확�하셔서 코"
+"드와 사용법� 확�하여 주시기 바�니다."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "그러한 사용�가 없습니다."
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"당신� 트위터 계정� 추가하세요. ���으로 당신� 메시지를 트위터� 전송합니"
+"다."
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "트위터로부터 \"%s\"를 위한 계정정보를 불러올 수 없습니다."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "프로필�나 �스트 검색"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"너무 많� 게시글� 너무 빠르게 올�옵니다. 한숨고르고 몇분후� 다시 �스트를 "
+"해보세요."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "IM, SMS, 트위터� 연결하기"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "찔러 보기"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "당신� 필요한 페�스� 어플리케�션 %s� 사용� 위해서 로그�하세요."
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s님� 귀하� 알림 메시지를 %2$s�서 듣고 있습니다.\n"
+"\t%3$s\n"
+"\n"
+"그럼 �만,%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "검색"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "그러한 문서는 없습니다."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "� 그룹� 회�리스트"
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "� 그룹� 회�리스트"
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "�용� 프로필"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s 와 친구들, %d 페�지"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "� 그룹� 회�리스트"
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "사용� 차단 해제� 실패했습니다."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "�� 코드"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "� 통지를 지울 수 없습니다."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "유효하지 않�태그: \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "별명� �미 사용중 입니다. 다른 별명� 시�해 보십시오."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "좋아하는 게시글� �성할 수 없습니다."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "새로운 통지"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "새로운 통지"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "유효한 별명� 아닙니다"
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "프로필� 지정하지 않았습니다."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "회�� 당신� 차단해왔습니다."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "당신� 해당 그룹� 멤버가 아닙니다."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "사용�를 차단합니다."
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "그룹� 만들기 위해서는 로그�해야 합니다."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "그룹"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "사용�를 업��트 할 수 없습니다."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "트위터 환경설정� 저장할 수 없습니다."
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "싱�설정� 저장�었습니다."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "관리�만 그룹� 편집할 수 있습니다."
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "관리�"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "결과 없�"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "회�� 당신� 차단해왔습니다."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "메시지"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "프로필� 저장 할 수 없습니다."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[오픈ID](%%doc.openid%%)는 당신� ��한 계정으로 많� 사�트� 로그�할 수 "
+"있게 해�니다. 여기�서 당신� 관련� 오픈ID를 관리하세요."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "프로필 세팅"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"%%site.name%% 는 마��로블로깅(http://en.wikipedia.org/wiki/Micro-blogging) "
+"서비스 입니다."
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've 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
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "당신� ���었습니다. 아래 새 비밀번호를 입력하세요."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "비밀 번호 복구가 요청�었습니다."
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "확� 코드 오류"
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "� 회�� 구�합니다."
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s 좋아하는 게시글, %d 페�지"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%s 그룹� 위한 공지피드"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "%s 그룹� 위한 공지피드"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "%s 그룹� 위한 공지피드"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"**%s** 는 %%%%site.name%%%% [마��로블로깅)(http://en.wikipedia.org/wiki/"
+"Micro-blogging)� 사용� 그룹입니다. "
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "관리�"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "로컬 사용� 아닙니다."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "%s 태그� 통지"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%s 그룹� 위한 공지피드"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"**%s**는 %%%%site.name%%%% [마��로블로깅](http://en.wikipedia.org/wiki/"
+"Micro-blogging) 서비스� 계정� 갖고 있습니다."
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s 는 지금 듣고 있습니다."
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s� 통지 피드"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s� 통지 피드"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "� 게시글� �미 좋아하는 게시글입니다."
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "� 메시지는 favorite� 아닙니다."
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "공개 stream� 불러올 수 없습니다."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "수신�를 지정하지 않았습니다."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "어떠한 �태� 찾� 수 없습니다."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / %2$s�게 답신 업��트"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "%2$s� 있는 %1$s� 업��트!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "��선스"
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s 구�"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "프로필 세팅"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "당신� 해당 그룹� 멤버가 아닙니다."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "통지를 저장하는� 문제가 발�했습니다."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "%2$s�서 %1$s까지 메시지"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "�용� 프로필"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "프로필"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "올리기"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "비밀번호 바꾸기"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "ì—°ê²°"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "검색"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "로그�"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "차단하기"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "사용�를 차단합니다."
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "%s logo 추가 혹� 수정"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "내용� 없습니다!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "�용�"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "검색"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "홈페�지 주소형�� 올바르지 않습니다."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "그러한 태그가 없습니다."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "%s�게 �접 메시지"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "메시지가 너무 길어요. 최대로 140�까지 입력하실 수 있습니다."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "따�가실 수 없습니다 : 사용�가 없습니다."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "설명� 너무 길어요. (최대 140글�)"
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "당신� �미 � 그룹� 멤버입니다."
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "그룹 %s� %s는 가입할 수 없습니다."
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "당신� 해당 그룹� 멤버가 아닙니다."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "그룹 %s�서 %s 사용�를 제거할 수 없습니다."
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s 그룹"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s 그룹들�  � 멤버입니다."
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "그룹 행�"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "아바타가 업��트 �었습니다."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "너무 �니다. 통지� 최대 길�는 140글� 입니다."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "지�하지 않는 그림 파� 형�입니다."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "사진"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "설명� 너무 길어요. (최대 140글�)"
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "%2$s� 있는 %1$s� 업��트!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "살펴 보고 있는 사용�가 없습니다."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "��� �지 않았습니다."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "리퀘스트 토�� 엑세스 토�으로 변환 할 수 없습니다."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "OMB 프로토콜� 알려지지 않� 버전"
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "그러한 통지는 없습니다."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "파�� 잃어버렸습니다."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "%2$s� 있는 %1$s� 업��트!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "� 페�지는 귀하가 승�한 미디어 타입�서는 �용할 수 없습니다."
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"귀하� 계정과 비밀 번호로 로그� 하세요. 계정� 아� 없으세요? [가입](%%"
+"action.register%%) 새 계정� �성 �는 [OpenID](%%action.openidlogin%%)를 사"
+"용해 보세요."
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "%2$s� 있는 %1$s� 업��트!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "\"%s\" � �치하는 모든 업��트"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "ì—°ê²°"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "140� �내�서 �기 소개"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "당신� 대해 소개해주세요."
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "�기소개가 너무 �니다. (최대 140글�)"
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "유효한 프로필 URL� 아닙니다. (YADIS 문서가 없습니다)"
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "그것� 로컬프로필입니다. 구�� 위해서는 로그�하십시오."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "리퀘스트 토�� 취� 할 수 없습니다."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%s� 통지 피드"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%s� 통지 피드"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "%s� 통지 피드"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "%2$s�서 %1$s까지 메시지"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s� 친구들� 위한 피드"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s� 친구들� 위한 피드"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s� 친구들� 위한 피드"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "%s� 보낸쪽지함"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "게시글� 등��었습니다."
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "� 페�지는 귀하가 승�한 미디어 타입�서는 �용할 수 없습니다."
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s� 통지 피드"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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:249
+#, 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:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"구�� 해지 �었습니다. 하지만 콜백 URL� 통과 �지 않았습니다. 웹사�트� 지"
+"시를 찾아 구� 해지 방법� 대하여 �어보십시오."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "아바타 URL '%s'�(를) �어낼 수 없습니다."
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "%S 잘못� 그림 파� 타입입니다. "
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "서버� 재접� 할 수 없습니다 : %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "�코니카 소프트웨어 ��선스"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "� �메� 주소로 사용�를 업��트 할 수 없습니다."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "찔러 보기를 보냈습니다."
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "당신� 보낸 메시지가 너무 길어요. 최대 140글�까지입니다."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "당신� 보낸 메시지가 너무 길어요. 최대 140글�까지입니다."
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "� 게시글� 대해 답장하기"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "통지를 저장하는� 문제가 발�했습니다."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "확� 코드가 없습니다."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "� 사�트 로그�"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "통신 회사를 선� 하세요."
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "140글�로 그룹�나 토픽 설명하기"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "140글�로 그룹�나 토픽 설명하기"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "새로운 통지"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s님� 당신� 게시글� 좋아하는 글로 추가했습니다."
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "다��서:"
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "공개 stream� 불러올 수 없습니다."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "통지 삭제"
diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
index 5dec309dd..d931277e3 100644
--- a/locale/mk/LC_MESSAGES/statusnet.mo
+++ b/locale/mk/LC_MESSAGES/statusnet.mo
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 0e91f0522..5061e1b84 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -1,39 +1,30 @@
-# #-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2008 FREE SOFTWARE MACEDONIA
-# This file is distributed under the same license as the PACKAGE package.
-# IGOR STAMATOVSKI <igor@slobodensoftver.org.mk>, 2008.
+# Translation of StatusNet to Macedonian
 #
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Author@translatewiki.net: Bjankuloski06
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+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"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:02+0000\n"
+"Language-Team: Macedonian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"#-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Пребарувај го потокот за „%s“"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -46,17 +37,19 @@ msgid " from "
 msgstr ""
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -88,6 +81,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s �ега ги �леди вашите забелешки за %2$s."
@@ -110,25 +104,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s �тату� на %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "Јавниот поток на %s"
@@ -138,40 +135,55 @@ msgstr "Јавниот поток на %s"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s и пријателите"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -180,7 +192,8 @@ msgstr ""
 "**%%site.name%%** е �ерви� за микроблогирање што ви го овозможува [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** е �ерви� за микроблогирање."
@@ -192,30 +205,34 @@ msgstr ". Придоне�увачите треба да бидат наведе
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 мали букви или бројки. Без интерпукци�ки знаци и празни ме�та."
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 или повеќе знаци"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 или повеќе знаци и не ја заборавајте!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr ""
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -225,6 +242,7 @@ msgstr ""
 "одобрите %S за да ви и�праќа пораки."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -254,7 +272,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
@@ -277,16 +322,23 @@ msgstr ""
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "За"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Прифати"
 
@@ -297,6 +349,9 @@ msgstr "Прифати"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Додај"
 
@@ -314,27 +369,29 @@ msgstr ""
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "�дре�а"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Сите претплати"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Сите новини од %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Сите новини кои �е еднакви �о бараниот термин „%s“"
@@ -344,31 +401,38 @@ msgstr "Сите новини кои Ñ�е еднакви Ñ�о бараниот Ñ
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Веќе �те најавени."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Веќе �те претплатени!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Одобрете ја претплатата"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Следниот пат најавете �е автомат�ки; не за компјутери кои ги делите �о други!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -376,15 +440,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "�ватар"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "�ватарот е ажуриран."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -395,24 +463,26 @@ msgstr ""
 "пријатели?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
 msgid "Before »"
-msgstr "Предходни »"
+msgstr "Претходно »"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Био"
 
@@ -420,16 +490,18 @@ msgstr "Био"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Биографијата е предолга (мак�имумот е 140 знаци)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr ""
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "�е може да �е прочита URL-то на аватарот: '%s'"
@@ -437,6 +509,8 @@ msgstr "�е може да �е прочита URL-то на аватарот: '
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "�овата лозинка не може да �е �ними"
 
@@ -444,31 +518,34 @@ msgstr "�овата лозинка не може да �е �ними"
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Откажи"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "�е е возможно да �е ин�танцира OpenID објект за потрошувачка."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Ова JabberID не може да �е нормализира."
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Промени"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr ""
 
@@ -478,11 +555,12 @@ msgid "Change password"
 msgstr "Промени ја лозинката"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr ""
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr ""
 
@@ -492,6 +570,9 @@ msgstr ""
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Потврди"
 
@@ -504,12 +585,14 @@ msgstr "Потврди ја адре�ата"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Потврдата е откажана"
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr ""
 
@@ -518,7 +601,8 @@ msgstr ""
 msgid "Confirmation code not found."
 msgstr "Кодот за потврда не е пронајден."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -538,20 +622,24 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Поврзи �е"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Поврзи �е �о по�тоечка �метка"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Контакт"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "OpenID формуларот не може да �е креира:%s"
@@ -559,35 +647,39 @@ msgstr "OpenID формуларот не може да �е креира:%s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr ""
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "�е може да �е прена�очи кон �ерверот: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Информациите за аватарот не може да �е �нимат"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Информациите за новиот профил не може да �е �нимат"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr ""
 
@@ -607,15 +699,17 @@ msgstr "Белезите за барање не може да Ñ�е конверÑ
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "�е може да �е креира потврда за е-пошта."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Претплата не може да �е избрише."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr ""
 
@@ -628,29 +722,38 @@ msgstr "�е може да �е земе белег за барање."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Кодот за потврда не може да �е вне�е."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "�е може да �е вне�е нова претплата."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Профилот не може да �е �ними."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -666,42 +769,48 @@ msgstr ""
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Кори�никот не може да �е о�вежи/"
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Креирај"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Креирај нов кори�ник �о овој прекар."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Креирај нова �метка"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Креирање на нова �метка за OpenID што веќе има кори�ник."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Моментално потврдена Jabber/GTalk адре�а."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -710,23 +819,27 @@ msgid "Currently"
 msgstr "Моментално"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Одговор од вне�от во базата: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr ""
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Опишете �е �ебе �и и �оп�твените интере�и во 140 знаци."
 
@@ -734,11 +847,13 @@ msgstr "Опишете �е �ебе �и и �оп�твените интере
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Е-пошта"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr ""
 
@@ -748,39 +863,43 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "�дре�ата веќе по�тои."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Потврдување на адре�ата"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr ""
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Вне�ете прекар или е-пошта"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Грешка во проверувањето на белегот"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Грешка во поврзувањето на кори�никот �о OpenID"
 
@@ -791,39 +910,46 @@ msgstr "Грешка во поврзувањето на кори�никот."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Грешка во вне�увањето на аватарот"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Грешка во вне�увањето на новиот профил"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Грешка во вне�увањето на оддалечениот профил"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Грешка во �нимањето на потвдата за адре�ата."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Грешка во �нимањето на оддалечениот профил"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Грешка во �нимањето на профилот."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Грешка во �нимањето на кори�никот."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Грешка во �нимањето на кори�никот; неправилен."
 
@@ -832,6 +958,9 @@ msgstr "Грешка во �нимањето на кори�никот; непр
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Грешка во по�тавувањето на кори�никот."
 
@@ -842,6 +971,7 @@ msgstr "Грешка во о�вежувањето на профилот"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Грешка во о�вежувањето на оддалечениот профил"
 
@@ -851,33 +981,36 @@ msgid "Error with confirmation code."
 msgstr "Грешка �о кодот за потврдување."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "По�тоечки прекар"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "ЧПП"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Товарањето на аватарот не у�пеа."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Канал �о пријатели на %S"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Канал �о одговори на %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
@@ -892,7 +1025,7 @@ msgstr ""
 msgid "Find people on this site"
 msgstr ""
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -905,6 +1038,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Цело име"
 
@@ -913,23 +1051,33 @@ msgstr "Цело име"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Целото име е предолго (мак�имум 255 знаци)"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Помош"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Дома"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Домашна �траница"
 
@@ -937,21 +1085,27 @@ msgstr "Домашна �траница"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Домашната �траница не е правилно URL."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr ""
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr ""
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM адре�а"
 
@@ -961,7 +1115,7 @@ msgid "IM Settings"
 msgstr "По�тавки за IM"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -969,7 +1123,7 @@ msgstr ""
 "�ко веќе имае �метка, пријавете �е �о Вашето кори�ничко име и лозика, за "
 "и�тата да ја поврзете �о Вашиот OpenID."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -977,7 +1131,7 @@ msgstr ""
 "�ко �акате да додадете OpenID на Вашата �метка, вне�ете го подолу и кликнете "
 "„Додај“."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -986,25 +1140,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "�еточна �тара лозинка"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "�еточно кори�ничко име или лозинка"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1013,30 +1173,31 @@ msgstr ""
 "пошта што е реги�трирана �о Вашата �метка."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "�еправилно URL за аватар: '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "�евалидна домашна �траница: '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "�еправилно URL за лиценца: '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "�еправилна �одржина за изве�тување"
 
@@ -1051,13 +1212,13 @@ msgid "Invalid notice url"
 msgstr "�еправилно url на изве�тување"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "�еправилно URL на профил: '%s'"
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "�еправилно URL на профил (лош формат)"
 
@@ -1075,44 +1236,52 @@ msgstr "Погрешна големина."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr ""
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 ""
-"Работи на [StatusNet](http://status.net/) �офтверот за микроблогирање, верзија "
-"%s, до�тапен пд [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+"Работи на [StatusNet](http://status.net/) �офтверот за микроблогирање, "
+"верзија %s, до�тапен пд [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Ова Jabber ID му припаќа на друг кори�ник."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1122,12 +1291,14 @@ msgstr ""
 "Вашата контакт ли�та во Вашиот IM клиент или GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr ""
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
@@ -1136,7 +1307,15 @@ msgstr ""
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Локација"
 
@@ -1145,7 +1324,12 @@ msgstr "Локација"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Локацијата е предолга (мак�имумот е 255 знаци)."
 
@@ -1154,18 +1338,22 @@ msgstr "Локацијата е предолга (мак�имумот е 255 з
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Пријави �е"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Пријавете �е �о [OpenID](%%doc.openid%%) �метка."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1175,22 +1363,26 @@ msgstr ""
 "Пријавете �е �о кори�ничко име и лозинка. �емате? [Реги�трирајте](%%action."
 "register%%) нова �метка или пробајте [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Одјави �е"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Загубена или заборавена лозинка?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -1201,16 +1393,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Член од"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Микроблог на %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1220,42 +1414,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Мојот тек�т и датотеки �е до�тапни под"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "�ов прекар"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "�ово изве�тување"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "�ова лозинка"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "�овата лозинка у�пешно е �нимена. Сега �те пријавени."
 
@@ -1265,7 +1467,13 @@ msgstr "Ð�овата лозинка уÑ�пешно е Ñ�нимена. Сега Ñ
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Прекар"
 
@@ -1274,7 +1482,12 @@ msgstr "Прекар"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
 
@@ -1283,47 +1496,58 @@ msgstr "Тој прекар е во употреба. Одберете друг.
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Прекарот мора да има �амо мали букви и бројки и да нема празни ме�та."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Тој прекар не е дозволен."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Прекар на кори�никот што �акате да го �ледите."
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Прекар или е-пошта"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr ""
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "�ема JabberID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "�ема барање за проверка!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr ""
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr ""
 
@@ -1335,11 +1559,15 @@ msgstr "�ема код за потврда."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "�ема �одржина!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr ""
 
@@ -1348,7 +1576,9 @@ msgid "No id."
 msgstr "�ема id."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr ""
 
@@ -1359,6 +1589,7 @@ msgstr "Серверот не до�тави прекар."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "�ема прекар."
 
@@ -1366,12 +1597,14 @@ msgstr "�ема прекар."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "�ема потврди кои може да �е откажат."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr ""
 
@@ -1381,7 +1614,8 @@ msgid "No profile URL returned by server."
 msgstr "Серверот не до�тави URL за профилот."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "�ема реги�трирана адре�а за е-пошта за тој кори�ник."
 
@@ -1393,7 +1627,7 @@ msgstr "�е е пронаједено барање."
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "�ема резултати"
 
@@ -1404,12 +1638,16 @@ msgstr "�ема големина."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1419,13 +1657,15 @@ msgid "No such OpenID."
 msgstr "�ема таков OpenID."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "�ема таков документ."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "�ема такво изве�тување."
 
@@ -1463,12 +1703,22 @@ msgstr "�ема таква претплата"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "�ема таков кори�ник."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr ""
 
@@ -1482,32 +1732,38 @@ msgid "Not a recovery code."
 msgstr "Ова не е код за �па�ување."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr ""
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "�еправилен JabberID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "�еправилен OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "�еправилна адре�а за е-пошта."
 
@@ -1515,6 +1771,11 @@ msgstr "�еправилна адре�а за е-пошта."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "�еправилен прекар."
 
@@ -1534,7 +1795,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "�еправилно URL на профил (нема YADIS документ)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "�е е �лика или датотеката е корумпирана."
 
@@ -1545,11 +1807,13 @@ msgstr "�е е одобрено."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Овој одговор не беше очекуван!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr ""
 
@@ -1565,11 +1829,15 @@ msgstr ""
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "�е �те пријавени."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "�е �те претплатени!"
 
@@ -1586,39 +1854,44 @@ msgid "Notice feed for %s"
 msgstr "Канал �о изве�тувања на %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Изве�тувањето нема профил"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Изве�тувања"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Стара лозинка"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "По�тавување на �метка за OpenID"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "�втомат�ко и�праќање на OpenID"
 
@@ -1626,29 +1899,34 @@ msgstr "�втомат�ко и�праќање на OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "Пријавување �о OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "Проверката на OpenID е откажана."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Проверката на OpenID не у�пеа: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "�еу�пех на OpenID: %s"
@@ -1664,11 +1942,12 @@ msgid "OpenID settings"
 msgstr "По�тавки за OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Парцијално товарање"
 
@@ -1678,34 +1957,46 @@ msgstr "Парцијално товарање"
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Лозинка"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Двете лозинки не �е �овпаѓаат."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Лозинката мора да биде од најмалку 6 знаци."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Побарано е пронаоѓање на лозинката"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Лозинката е �нимена."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Лозинките не �е �овпаѓаат."
 
@@ -1725,14 +2016,17 @@ msgid "People search"
 msgstr "Пребарување на луѓе"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Личен"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr ""
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
@@ -1746,7 +2040,7 @@ msgstr ""
 "овој кори�ник. �ко не �акате да �е претплатите, кликнете на „Откажи“."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "И�прати изве�тување кога мојот �тату� на Jabber/GTalk ќе �е �мени."
 
@@ -1755,7 +2049,9 @@ msgstr "ИÑ�прати извеÑ�тување кога мојот Ñ�татуÑ� Ð
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Преференции"
 
@@ -1764,42 +2060,52 @@ msgstr "Преференции"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Преференциите �е �нимени."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Приватно�т"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Проблем во �нимањето на изве�тувањето."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Профил"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "URL на профилот"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "По�тавки на профилот"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "�епознат профил"
 
@@ -1808,17 +2114,19 @@ msgid "Public Stream Feed"
 msgstr "Јавен канал"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Јавна и�торија"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1828,12 +2136,14 @@ msgid "Recent Tags"
 msgstr ""
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Пронајди"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Пронаоѓање на лозинка"
 
@@ -1846,37 +2156,45 @@ msgstr "Код за пронаоѓање за непознат кори�ник.
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Реги�трирај �е"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr ""
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Одбиј"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Запамети ме"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Оддалечениот профил нема одговарачки профил"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Оддалечена претплата"
 
@@ -1890,6 +2208,9 @@ msgstr "Оддалечена претплата"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "От�трани"
 
@@ -1898,7 +2219,7 @@ msgstr "От�трани"
 msgid "Remove OpenID"
 msgstr "От�трани го OpenID-то"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1907,34 +2228,41 @@ msgstr ""
 "пријавите. �ко треба да го от�траните, прво додајте друг OpenID."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Одговори"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Одговори и�пратени до %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Ре�етирај"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Ре�тетирај ја лозинката"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr ""
 
@@ -1943,17 +2271,18 @@ msgstr ""
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "И�то како лозинката погоре"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -1966,12 +2295,21 @@ msgstr ""
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Сними"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Барај"
 
@@ -1981,7 +2319,7 @@ msgid "Search Stream Feed"
 msgstr "Барај во каналот"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1990,7 +2328,7 @@ msgstr ""
 "Барајте изве�тувања на %%site.name%% �поред нивната �одржина. Термините "
 "одделете ги �о празни ме�та. �ајмала должина е 3 знаци."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2000,48 +2338,56 @@ msgstr ""
 "Термините одделете ги �о празни ме�та. �ајмала должина е 3 знаци."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "И�прати"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "И�праќај ми изве�тувања преку Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "По�тавки"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "По�тавките �е �нимени."
 
@@ -2061,27 +2407,32 @@ msgid "Something weird happened."
 msgstr "�ешто чудно �е �лучи."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Изворен код"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Стати�тика"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Зачуваниот OpenID не е пронајден."
 
@@ -2089,24 +2440,28 @@ msgstr "Зачуваниот OpenID не е пронајден."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Претплати �е"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Претплатници"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Претплатата е одобрена"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Претплатата е одбиена"
 
@@ -2114,28 +2469,35 @@ msgstr "Претплатата е одбиена"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Претплати"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Си�тем�ка грешка при товарањето на датотеката."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr ""
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr ""
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Тек�туално пребарување"
 
@@ -2155,6 +2517,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Овој код за потврда не е за Ва�!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr ""
 
@@ -2164,63 +2527,73 @@ msgid "That file is too big."
 msgstr "Датотеката е преголема."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Ова веќе е Вашиот Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Ова не е Вашиот Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Ова е погрешната IM адре�а."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Ова е предолго. Мак�ималната должина е 140 знаци."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "�дре�ата  \"%s\" е потврдена за Вашата �метка."
@@ -2229,11 +2602,14 @@ msgstr "Ð�дреÑ�ата  \"%s\" е потврдена за Вашата Ñ�меÑ
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "�дре�ата е от�транета."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2243,7 +2619,8 @@ msgstr ""
 "ме�тото за да видите како да ја одобрите претплатата. Вашиот белег за "
 "претплата е:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2253,33 +2630,38 @@ msgstr ""
 "ме�тото за да видите како цело�но да ја одбиете претплатата."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Ова �е луѓето што ги �ледат изве�тувањата на %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Ова �е луѓето што ги �ледат Вашите изве�тувања."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Ова �е луѓето чии изве�тувања ги �леди %s."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Ова �е луѓето чии изве�тувања ги �ледите."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Овој код за потврда е премногу �тар. Почнете од почеток."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2288,7 +2670,7 @@ msgstr ""
 "на копчето „И�прати“ за да одите до Вашиот OpenID �набдувач."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2303,6 +2685,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
@@ -2311,25 +2696,37 @@ msgstr ""
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Оваа �траница не е до�тапна во форматот кој Вие го прифаќате."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2342,18 +2739,21 @@ msgstr ""
 "подолу."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL на Вашата домашна �траница, блог или профил на друго ме�то."
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL на Вашиот профил на друго компатибилно ме�то за микроблогирање."
 
@@ -2365,15 +2765,22 @@ msgstr "URL на Вашиот профил на друго компатибилÐ
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "�еочекувано и�праќање на формулар."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "�еочекувано ре�етирање на лозинка."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr ""
 
@@ -2404,38 +2811,47 @@ msgstr "Откажи ја претплатата"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "�еподдржнана верзија на ОМВ"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "�еподдржан фомрат на �лики."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Товари"
 
@@ -2456,12 +2872,15 @@ msgid "Upload a new profile image"
 msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Се кори�ти �амо за надградби, објави и пронаоѓање на лозинка."
 
@@ -2485,11 +2904,16 @@ msgstr "Кори�никот кој го �ледите не по�тои."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Кори�никот нема профил."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Прекар на кори�никот"
 
@@ -2498,29 +2922,33 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Што има %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Каде �е наоѓате, на пр. „Град, Држава“."
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Погрешен тип на �лика за '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Погрешна големина на �лика на '%s'"
@@ -2528,7 +2956,9 @@ msgstr "Погрешна големина на �лика на '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr ""
 
@@ -2549,11 +2979,12 @@ msgid "You are already logged in!"
 msgstr "Веќе �те пријавени!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2571,7 +3002,7 @@ msgstr "Можете да креирате нова Ñ�метка за да иÑ�Ð
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
@@ -2579,6 +3010,7 @@ msgstr ""
 "Можте да от�траните OpenID од Вашата �метка �о кликање на копчето „От�трани“."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2587,7 +3019,8 @@ msgstr ""
 "Можете да примате и праќате изве�тувања преку Jabber/GTalk [брзи пораки](%%"
 "doc.im%%). Подолу "
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2598,21 +3031,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Може да ја кори�тите локалната претплата."
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "�е може да �е реги�трирате ако не ја прифаќате лиценцата."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "�е ни го и�пративте тој профил."
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2626,37 +3061,41 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr ""
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Идентификувани �те. Подолу можете да вне�ете нова лозинка."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "Вашето URL за OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Вашиот прекар на овој �ервер или адре�ата за е-пошта �о која �е "
 "реги�триравте."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2666,47 +3105,57 @@ msgstr ""
 "и�тата кори�ничка �метка. Овде можете да ги уредите Вашите поврзани OpenID-"
 "ја."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "пред неколку �екунди"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "пред %d денови"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "пред %d ча�а"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "пред %d минути"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "пред %d ме�еци"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "пред еден ден"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "пред една минута"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "пред еден ме�ец"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "пред една година"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "пред еден ча�"
 
@@ -2728,19 +3177,20 @@ msgid "reply"
 msgstr "одговор"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "и�то како лозинката погоре"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr ""
 
 #: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
 msgid "« After"
-msgstr "« Следни"
+msgstr "« Следно"
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
@@ -2755,6 +3205,26 @@ msgstr "« Следни"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2763,6 +3233,7 @@ msgid "This notice is not a favorite!"
 msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -2770,22 +3241,28 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2795,11 +3272,13 @@ msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2839,33 +3318,44 @@ msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr ""
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr ""
 
@@ -2919,6 +3409,11 @@ msgstr ""
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr ""
 
@@ -2947,6 +3442,8 @@ msgid "New password successfully saved. "
 msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2967,12 +3464,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2980,7 +3480,7 @@ msgstr ""
 msgid "No such message."
 msgstr ""
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
@@ -3004,51 +3504,70 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
@@ -3067,14 +3586,17 @@ msgid ""
 msgstr ""
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr ""
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr ""
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -3083,6 +3605,7 @@ msgid "Twitter Username"
 msgstr ""
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr ""
 
@@ -3091,24 +3614,29 @@ msgid "Twitter Password"
 msgstr ""
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -3119,33 +3647,43 @@ msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -3162,18 +3700,19 @@ msgid "The subscription has been rejected, but no "
 msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3183,89 +3722,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3273,11 +3834,11 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3292,7 +3853,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -3304,7 +3865,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3313,31 +3874,39 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr ""
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr ""
 
@@ -3350,14 +3919,19 @@ msgid "Twitter integration options"
 msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s и пријателите"
@@ -3367,22 +3941,32 @@ msgid "You can upload your personal avatar."
 msgstr ""
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "По�тавки"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
@@ -3399,35 +3983,44 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "�ема такво изве�тување."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr ""
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "�ема таков кори�ник."
@@ -3436,12 +4029,12 @@ msgstr "�ема таков кори�ник."
 msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 #, fuzzy
 msgid "You have already blocked this user."
 msgstr "Веќе �те пријавени!"
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3458,40 +4051,57 @@ msgstr ""
 msgid "Add to favorites"
 msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
-msgstr "�ема прекар."
+msgstr "�ема прекар"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "�ема такво изве�тување."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3501,16 +4111,17 @@ msgid "Nickname must have only lowercase letters "
 msgstr "Прекарот мора да има �амо мали букви и бројки и да нема празни ме�та."
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "Биографијата е предолга (мак�имумот е 140 знаци)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "Кори�никот не може да �е о�вежи/"
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 #, fuzzy
 msgid "Options saved."
 msgstr "По�тавките �е �нимени."
@@ -3528,7 +4139,8 @@ msgstr ""
 msgid "Send me email when someone "
 msgstr ""
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3544,7 +4156,7 @@ msgstr ""
 "И�пративме код за потврда на IM адре�ата што ја додадовте. Мора да го "
 "одобрите %S за да ви и�праќа пораки."
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3558,54 +4170,69 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "�ема �одржина!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 #, fuzzy
 msgid "After"
 msgstr "« Следни"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "Предходни »"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "Канал �о пријатели на %S"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3651,12 +4278,14 @@ msgstr ""
 msgid "Sync preferences"
 msgstr "Преференции"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr ""
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "�ема такво изве�тување."
@@ -3671,7 +4300,8 @@ msgid "The most popular notices on the site right now."
 msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3685,15 +4315,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr ""
 
@@ -3701,12 +4333,14 @@ msgstr ""
 msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "�ватарот е ажуриран."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "Товарањето на аватарот не у�пеа."
@@ -3726,7 +4360,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
@@ -3741,6 +4376,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "Креирај нова �метка"
@@ -3753,7 +4389,7 @@ msgstr ""
 "Барајте луѓе на %%site.name%% �поред нивното име, локација или интере�и. "
 "Термините одделете ги �о празни ме�та. �ајмала должина е 3 знаци."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "Пребарување на луѓе"
@@ -3777,21 +4413,21 @@ msgstr "И�праќај ми изве�тувања преку Jabber/GTalk."
 msgid "A confirmation code was sent "
 msgstr "�ема код за потврда."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Веќе �те пријавени!"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "�е може да �е прена�очи кон �ерверот: %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr ""
@@ -3800,16 +4436,19 @@ msgstr ""
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "�ема такво изве�тување."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "�е ни го и�пративте тој профил."
@@ -3818,21 +4457,25 @@ msgstr "�е ни го и�пративте тој профил."
 msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr ""
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "OpenID формуларот не може да �е креира:%s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -3844,16 +4487,18 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "Информациите за аватарот не може да �е �нимат"
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "�е може да �е креира претплатата"
@@ -3867,12 +4512,15 @@ msgstr "Датотеката е преголема."
 msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 #, fuzzy
 msgid "Notice posted"
 msgstr "Изве�тувања"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr ""
 
@@ -3889,7 +4537,7 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "Пријавување �о OpenID"
@@ -3917,11 +4565,13 @@ msgstr ""
 msgid "Service"
 msgstr "Барај"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Локацијата е предолга (мак�имумот е 255 знаци)."
@@ -3931,17 +4581,18 @@ msgstr "Локацијата е предолга (мак�имумот е 255 з
 msgid "Change your password."
 msgstr "Промени ја лозинката"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "Лозинката е �нимена."
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "�еправилна адре�а за е-пошта."
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -3951,12 +4602,13 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "�епознат профил"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -3966,21 +4618,26 @@ msgid "Automatically subscribe to whoever "
 msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "�евалидна домашна �траница: '%s'"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "Профилот не може да �е �ними."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "Јавна и�торија"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
@@ -4001,11 +4658,13 @@ msgstr "Јавен канал"
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4063,7 +4722,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "Одговори и�пратени до %s"
@@ -4073,53 +4733,74 @@ msgstr "Одговори и�пратени до %s"
 msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "�ема такво изве�тување."
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "Изве�тувања"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "Канал �о изве�тувања на %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "Член од"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr ""
 
@@ -4134,7 +4815,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4145,32 +4826,39 @@ msgid "'s profile"
 msgstr "Профил"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "Кори�никот нема профил."
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr ""
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr ""
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "Претплатници"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr ""
 
@@ -4196,7 +4884,7 @@ msgstr "И�праќај ми изве�тувања преку Jabber/GTalk."
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Овој код за потврда не е за Ва�!"
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr ""
 
@@ -4260,17 +4948,18 @@ msgstr "Ова �е луѓето чии изве�тувања ги �леди %
 msgid "These are the people whose "
 msgstr "Ова �е луѓето што ги �ледат изве�тувањата на %s."
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "�ема JabberID."
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Микроблог на %s"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4294,7 +4983,7 @@ msgstr ""
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4304,17 +4993,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "Информациите за аватарот не може да �е �нимат"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4323,20 +5012,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "�ема такво изве�тување."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "Микроблог на %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "�е е пронаједено барање."
@@ -4345,16 +5037,17 @@ msgstr "�е е пронаједено барање."
 msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 #, fuzzy
 msgid "Twitter password"
 msgstr "�ова лозинка"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr ""
 
@@ -4367,157 +5060,166 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr "�е може да �е креира потврда за е-пошта."
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "Грешка во �нимањето на кори�никот."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "Серверот не до�тави URL за профилот."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 #, fuzzy
 msgid "No profile with that id."
 msgstr "Оддалечениот профил нема одговарачки профил"
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Откажи ја претплатата"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr ""
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблем во �нимањето на изве�тувањето."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 #, fuzzy
 msgid "Upload an avatar"
 msgstr "Товарањето на аватарот не у�пеа."
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr ""
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr ""
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Account"
 msgstr "За"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "Креирај нова �метка"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "�ема таков OpenID."
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "Помош"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "�ово изве�тување"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "�ово изве�тување"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Претплати"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "�ема таков кори�ник."
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr ""
 
@@ -4530,12 +5232,15 @@ msgstr ""
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "Креирај нова �метка"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 #, fuzzy
 msgid "Published"
 msgstr "Јавен"
@@ -4557,34 +5262,39 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL на Вашата домашна �траница, блог или профил на друго ме�то."
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
 msgstr "Претплати"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "Опишете �е �ебе �и и �оп�твените интере�и во 140 знаци."
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4594,21 +5304,21 @@ msgstr "Каде �е наоѓате, на пр. „Град, Држава“."
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 #, fuzzy
 msgid "Logo"
 msgstr "Одјави �е"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
@@ -4641,12 +5351,12 @@ msgstr "Пријави �е"
 msgid "Leave"
 msgstr "Сними"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Погрешно име или лозинка."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Креирај нова �метка"
@@ -4667,24 +5377,24 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s �ега ги �леди вашите забелешки за %2$s."
 
-#: lib/mail.php:254
-#, fuzzy, php-format
+#: lib/mail.php:254 lib/mail.php:253
+#, php-format
 msgid "Location: %s\n"
 msgstr ""
 
-#: lib/mail.php:256
-#, fuzzy, php-format
+#: lib/mail.php:256 lib/mail.php:255
+#, php-format
 msgid "Homepage: %s\n"
 msgstr ""
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
@@ -4699,43 +5409,51 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s �ега ги �леди вашите забелешки за %2$s."
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "�ово изве�тување"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 или повеќе знаци"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 #, fuzzy
 msgid "in reply to"
 msgstr "во одговор на..."
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "одговор"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr ""
 
@@ -4756,27 +5474,29 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Јавен"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "Пребарување на луѓе"
@@ -4794,32 +5514,34 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Оддалечена претплата"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Оддалечена претплата"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Кори�никот нема профил."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "Претплатата е одобрена"
@@ -4833,11 +5555,12 @@ msgid "Top posters"
 msgstr ""
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 #, fuzzy
 msgid "Unblock this user"
 msgstr "�ема таков кори�ник."
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr ""
 
@@ -4845,22 +5568,2018 @@ msgstr ""
 msgid "Unsubscribe from this user"
 msgstr ""
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Канал �о пријатели на %S"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Канал �о пријатели на %S"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Канал �о пријатели на %S"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s и пријателите"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "�ватарот е ажуриран."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Микроблог на %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Барајте луѓе на %%site.name%% �поред нивното име, локација или интере�и. "
+"Термините одделете ги �о празни ме�та. �ајмала должина е 3 знаци."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Пребарувај го потокот за „%s“"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Поради безбедно�ни причини треба повторно да го вне�ете Вашето кори�ничко "
+"име и лозинка пред да ги �мените Вашите по�тавки."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Јавен канал"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Јавен канал"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Јавен канал"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"о�вен �ледниве лични податоци: лозинка, адре�а за е-пошта, адре�а за ИМ, "
+"телефон�ки број."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Креирај"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "�ема такво изве�тување."
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "Профил"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "�ватар"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "По�тавки на профилот"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "Овој код за потврда не е за Ва�!"
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "�ема таков кори�ник."
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "�е може да �е креира потврда за е-пошта."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"�ко веќе имае �метка, пријавете �е �о Вашето кори�ничко име и лозика, за "
+"и�тата да ја поврзете �о Вашиот OpenID."
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s �ега ги �леди вашите забелешки на %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"И�крено ваш,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Барај"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "�ема таков документ."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "�е може да �е прена�очи кон �ерверот: %s"
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "�ема таков кори�ник."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Кори�никот нема профил."
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s и пријателите"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "�ема таков кори�ник."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Локација"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "�ема такво изве�тување."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "�евалидна домашна �траница: '%s'"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Тој прекар е во употреба. Одберете друг."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Информациите за аватарот не може да �е �нимат"
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "�ово изве�тување"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "�ово изве�тување"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "�еправилен прекар."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Кори�никот нема профил."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "�е ни го и�пративте тој профил."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "�ема таков кори�ник."
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Кори�никот не може да �е о�вежи/"
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Преференциите �е �нимени."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "�ема резултати"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Кори�никот нема профил."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+msgid "Message sent"
+msgstr ""
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Профилот не може да �е �ними."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) Ви овозможува да �е пријавувате на многу ме�та �о "
+"и�тата кори�ничка �метка. Овде можете да ги уредите Вашите поврзани OpenID-"
+"ја."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "По�тавки на профилот"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've 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
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Идентификувани �те. Подолу можете да вне�ете нова лозинка."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Побарано е пронаоѓање на лозинката"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Грешка �о кодот за потврдување."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Претплатата е одобрена"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "�ема такво изве�тување."
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Креирај нова �метка"
+msgid "Not a local notice"
+msgstr "�ема таков кори�ник."
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "�дре�ата за е-пошта неможе да �е потврди."
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
 
-#~ msgid "Email address"
-#~ msgstr "�дре�а за е-пошта"
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Грешка во вне�увањето на изве�тувањето"
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s �ега ги �леди вашите забелешки за %2$s."
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Кори�никот не може да �е о�вежи/"
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Кори�никот не може да �е о�вежи/"
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s �тату� на %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Микроблог на %s"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Сите претплати"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "По�тавки на профилот"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "�е ни го и�пративте тој профил."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Проблем во �нимањето на изве�тувањето."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Кори�никот нема профил."
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Профил"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Товари"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Промени ја лозинката"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Поврзи �е"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Барај"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Пријави �е"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "�ема таков кори�ник."
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "�ема таков кори�ник."
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "�ема �одржина!"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Барај"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Домашната �траница не е правилно URL."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "�ема такво изве�тување."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Ова е предолго. Мак�ималната должина е 140 знаци."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "�е може да �е прена�очи кон �ерверот: %s"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "�ко �те ја заборавиле или загубиле лозинката, можете да добиете нова на "
-#~ "адре�ата што ја вне�овте во Вашата �метка."
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Биографијата е предолга (мак�имумот е 140 знаци)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Веќе �те пријавени!"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "�е може да �е прена�очи кон �ерверот: %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "�е ни го и�пративте тој профил."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "OpenID формуларот не може да �е креира:%s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Профил"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "�е ни го и�пративте тој профил."
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "�ватарот е ажуриран."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Ова е предолго. Мак�ималната должина е 140 знаци."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "�еподдржан фомрат на �лики."
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Биографијата е предолга (мак�имумот е 140 знаци)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Микроблог на %s"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Кори�никот кој го �ледите не по�тои."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "�е е одобрено."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Белезите за барање не може да �е конвертираат во белези за при�тап."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "�епозната верзија на протоколот OMB."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "�ема такво изве�тување."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "�ема такво изве�тување."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Микроблог на %s"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Оваа �траница не е до�тапна во форматот кој Вие го прифаќате."
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Пријавете �е �о кори�ничко име и лозинка. �емате? [Реги�трирајте](%%action."
+"register%%) нова �метка или пробајте [OpenID](%%action.openidlogin%%). "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Микроблог на %s"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Сите новини кои �е еднакви �о бараниот термин „%s“"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Поврзи �е"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Опишете �е �ебе �и и �оп�твените интере�и во 140 знаци."
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Опишете �е �ебе �и и �оп�твените интере�и во 140 знаци."
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Биографијата е предолга (мак�имумот е 140 знаци)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "�еправилно URL на профил (нема YADIS документ)."
+
+#: 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 "�е може да �е земе белег за барање."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Одговори и�пратени до %s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Канал �о пријатели на %S"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Канал �о пријатели на %S"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Канал �о пријатели на %S"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Изве�тувања"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Оваа �траница не е до�тапна во форматот кој Вие го прифаќате."
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Канал �о изве�тувања на %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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:249
+#, 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:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Претплатата е одбиена, но нема вратено URL. Проверете ги ин�трукциите за "
+"ме�тото за да видите како цело�но да ја одбиете претплатата."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "�е може да �е прочита URL-то на аватарот: '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Погрешен тип на �лика за '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "�е може да �е прена�очи кон �ерверот: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "�ово изве�тување"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Кори�никот не може да �е о�вежи/"
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Одговори и�пратени до %s"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Проблем во �нимањето на изве�тувањето."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "�ема код за потврда."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Опишете �е �ебе �и и �оп�твените интере�и во 140 знаци."
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Опишете �е �ебе �и и �оп�твените интере�и во 140 знаци."
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "�ово изве�тување"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%1$s �ега ги �леди вашите забелешки за %2$s."
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Кори�никот не може да �е о�вежи/"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "�ово изве�тување"
diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo
index ee3bad415..509dd898c 100644
--- a/locale/nb/LC_MESSAGES/statusnet.mo
+++ b/locale/nb/LC_MESSAGES/statusnet.mo
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 5e2d6613c..e53d2ddeb 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -1,3 +1,7 @@
+# Translation of StatusNet to Norwegian (bokmål)‬
+#
+# Author@translatewiki.net: Laaknor
+# --
 # #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -6,33 +10,28 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-09-26 22:45+0000\n"
-"Last-Translator: Eivind Uggedal <eivind@uggedal.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+""
+"Project-Id-Version: StatusNet\n"
+"PO-Revision-Date: 2009-11-06 13:07:43+0000\n"
+"Language-Team: Norwegian (bokmål)‬\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-"X-Poedit-Language: Norwegian Bokmal\n"
-"X-Poedit-Country: NORWAY\n"
+"X-Generator: MediaWiki 1.16alpha(r58638); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: no\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr "Søkestrøm for «%s»"
+msgstr "Søk i strømmen etter \"%s\""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og "
-"telefonnummer."
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
+msgid " except this private data: password, email address, IM address, phone number."
+msgstr "utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og telefonnummer."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
@@ -40,110 +39,57 @@ msgid " from "
 msgstr "fra"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Oppdateringer som svarer til %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s har invitert deg til %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, 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 ""
-"%$1s har invitert deg til %2$s (%3$s).\n"
-"\n"
-"%$2s er en mikrobloggingteneste som lar deg holde deg oppdatert på folk du "
-"kjenner og/eller som interesserer deg.\n"
-"\n"
-"Du kan også dele nyheter om deg sjelv, dine tanker eller livet ditt på "
-"nettet med folk som kjenner til deg. Det er supert for å møte nye folk med "
-"like interesser.\n"
-"\n"
-"%1$s sa:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Du kan se profilsiden til %1$s på %2$s her:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Hvis du vil prøva tjenesten, klikk på lenken nedenfor for å akseptere "
-"invitasjonen.\n"
-"\n"
-"Vennlig hilsen, %2$s\n"
+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\nYou 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\nYou can see %1$s's profile page on %2$s here:\n\n%5$s\n\nIf you'd like to try the service, click on the link below to accept the invitation.\n\n%6$s\n\nIf not, you can ignore this message. Thanks for your patience and your time.\n\nSincerely, %2$s\n"
+msgstr "%$1s har invitert deg til %2$s (%3$s).\n\n%$2s er en mikrobloggingteneste som lar deg holde deg oppdatert på folk du kjenner og/eller som interesserer deg.\n\nDu kan også dele nyheter om deg sjelv, dine tanker eller livet ditt på nettet med folk som kjenner til deg. Det er supert for å møte nye folk med like interesser.\n\n%1$s sa:\n\n%4$s\n\nDu kan se profilsiden til %1$s på %2$s her:\n\n%5$s\n\nHvis du vil prøva tjenesten, klikk på lenken nedenfor for å akseptere invitasjonen.\n\nVennlig hilsen, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s lytter nå til dine notiser på %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-msgstr ""
-"%1$s lytter nå til dine notiser på %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Vennlig hilsen,\n"
-"%4$s.\n"
+msgid "%1$s is now listening to your notices on %2$s.\n\n	%3$s\n\nFaithfully yours,\n%4$s.\n"
+msgstr "%1$s lytter nå til dine notiser på %2$s.\n\n	%3$s\n\nVennlig hilsen,\n%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s sin status på %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s offentlig strøm"
@@ -153,51 +99,59 @@ msgstr "%s offentlig strøm"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s og venner"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s offentlig tidslinje"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidslinje"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s oppdateringer fra alle sammen!"
 
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-"(Du vil straks motta en epost med instruksjoner om hvordan du kan bekrefte "
-"din epostadresse)"
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
+msgid "(You should receive a message by email momentarily, with instructions on how to confirm your email address.)"
+msgstr "(Du vil straks motta en epost med instruksjoner om hvordan du kan bekrefte din epostadresse)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-"**%%site.name%%** er en mikrobloggingtjeneste av "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgid "**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgstr "**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** er en mikrobloggingtjeneste. "
@@ -209,54 +163,46 @@ msgstr ". Bidragsytere burde være etterfulgt av fullt navn eller kallenavn."
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd."
+msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 eller flere tegn"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 eller flere tegn. Og ikke glem det!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 eller flere tegn. PÃ¥krevd."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-"En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Du må "
-"godkjenne %s for å sende meldinger til deg."
+msgid "A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you."
+msgstr "En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Du må godkjenne %s for å sende meldinger til deg."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-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 ""
-"En bekreftelseskode ble sendt til epostadressen du la til. Sjekk innboksen "
-"din (og søppelboksen) for koden, og hvordan du skal bruke den."
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
+msgid "A confirmation code was sent to the email address you added. Check your inbox (and spam box!) for the code and instructions on how to use it."
+msgstr "En bekreftelseskode ble sendt til epostadressen du la til. Sjekk innboksen din (og søppelboksen) for koden, og hvordan du skal bruke den."
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen "
-"din for koden, og hvordan du skal bruke den."
+msgid "A confirmation code was sent to the phone number you added. Check your inbox (and spam box!) for the code and instructions on how to use it."
+msgstr "En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen din for koden, og hvordan du skal bruke den."
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -276,7 +222,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API-metode ikke funnet!"
 
@@ -299,16 +272,23 @@ msgstr "API-metode ikke funnet!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "API-metode under utvikling."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Om"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Godta"
 
@@ -319,6 +299,9 @@ msgstr "Godta"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Legg til"
 
@@ -336,27 +319,29 @@ msgstr "Legg til eller fjern OpenID-er"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Adresse"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Adresser til venner som skal inviteres (én per linje)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Alle abonnementer"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Alle oppdateringer for %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Alle oppdateringer for søket: «%s»"
@@ -366,65 +351,67 @@ msgstr "Alle oppdateringer for søket: «%s»"
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Allerede innlogget."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Allerede abonnert!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Er du sikker på at du vil slette denne notisen?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autoriser abonnementet"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
+msgstr "Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
+msgid "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Brukerbilde"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Brukerbildet har blitt oppdatert."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, 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 ""
-"Venter på godkjenning. Sjekk din Jabber/GTalk-konto for en melding med "
-"instruksjoner (la du %s til vennelisten din?)"
+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 "Venter på godkjenning. Sjekk din Jabber/GTalk-konto for en melding med instruksjoner (la du %s til vennelisten din?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Venter på bekreftelse av adressen. Sjekk innboksen din (og søppelboksen) for "
-"melding med videre veiledning."
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
+msgid "Awaiting confirmation on this address. Check your inbox (and spam box!) for a message with further instructions."
+msgstr "Venter på bekreftelse av adressen. Sjekk innboksen din (og søppelboksen) for melding med videre veiledning."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Venter på bekreftelse for dette telefonnummeret."
 
@@ -436,6 +423,8 @@ msgstr "Tidligere »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Om meg"
 
@@ -443,16 +432,18 @@ msgstr "Om meg"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "«Om meg» er for lang (maks 140 tegn)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Kan ikke slette notisen."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Kan ikke lese brukerbilde-URL «%s»"
@@ -460,6 +451,8 @@ msgstr "Kan ikke lese brukerbilde-URL «%s»"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Klarer ikke å lagre nytt passord."
 
@@ -467,31 +460,34 @@ msgstr "Klarer ikke å lagre nytt passord."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Klarer ikke instansiere OpenID-objekt."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Klarer ikke normalisere Jabber-IDen"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Klarer ikke normalisere epostadressen"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Endre"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Endre eposthåndtering"
 
@@ -501,11 +497,12 @@ msgid "Change password"
 msgstr "Endre passord"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Endre passordet ditt"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Endre profilinnstillingene dine"
 
@@ -515,6 +512,9 @@ msgstr "Endre profilinnstillingene dine"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Bekreft"
 
@@ -527,12 +527,14 @@ msgstr "Bekreft adresse"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Bekreftelse avbrutt."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Bekreftelseskode"
 
@@ -541,155 +543,51 @@ msgstr "Bekreftelseskode"
 msgid "Confirmation code not found."
 msgstr "Fant ikke bekreftelseskode."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%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 ""
-"Gratulerer, %s! Og velkommen til %%%%site.name%%%%. Herfra vil du kanskje...\n"
-"\n"
-"* Gå til [din profil](%s) og sende din første notis.\n"
-"* Legge til en [Jabber/GTalk addresse](%%%%action.imsettings%%%%) så du kan "
-"sende notiser fra lynmeldinger.\n"
-"* [Søke etter brukere](%%%%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."
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to...\n\n* Go to [your profile](%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\nThanks for signing up and we hope you enjoy using this service."
+msgstr "Gratulerer, %s! Og velkommen til %%%%site.name%%%%. Herfra vil du kanskje...\n\n* Gå til [din profil](%s) og sende din første notis.\n* Legge til en [Jabber/GTalk addresse](%%%%action.imsettings%%%%) så du kan sende notiser fra lynmeldinger.\n* [Søke etter brukere](%%%%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\nThanks for signing up and we hope you enjoy using this service."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Koble til"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Koble til eksisterende konto"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr ""
-
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Klarte ikke å lagre brukerbilde-informasjonen"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Klarte ikke å lagre den nye profil-informasjonen"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr ""
-
 #: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
 msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
-
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
-#: actions/confirmaddress.php:84 actions/emailsettings.php:252
-#: actions/imsettings.php:226 actions/smssettings.php:249
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr ""
-
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr ""
-
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr ""
-
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Klarte ikke å lagre profil."
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr ""
-
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
 #: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
@@ -702,67 +600,50 @@ msgstr ""
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Klarte ikke å oppdatere bruker."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Opprett"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Lag en ny bruker med dette nicket."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Opprett en ny konto"
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr ""
-
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Nåværende bekreftede Jabber/GTak-adresse."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Nåværende bekreftede telefonnummer med mulighet for å motta SMS."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Nåværende bekreftede e-postadresse"
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr ""
-
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr ""
-
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
@@ -770,11 +651,13 @@ msgstr "Beskriv degselv og dine interesser med 140 tegn"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "E-post"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "E-postadresse"
 
@@ -783,162 +666,46 @@ msgstr "E-postadresse"
 msgid "Email Settings"
 msgstr "Innstillinger for e-post"
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr ""
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr ""
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr ""
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr ""
-
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr ""
-
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr ""
-
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr ""
-
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr ""
-
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Eksisterende nick"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "OSS/FAQ"
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr ""
-
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed for %s sine venner"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed for svar til %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Feed for taggen %s"
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Fullt navn"
 
@@ -947,45 +714,38 @@ msgstr "Fullt navn"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Beklager, navnet er for langt (max 250 tegn)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Hjelp"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Hjem"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Hjemmesiden"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr ""
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr ""
-
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM-adresse"
 
@@ -994,108 +754,48 @@ msgstr "IM-adresse"
 msgid "IM Settings"
 msgstr "Innstillinger for IM"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-
-#: ../actions/openidsettings.php:45
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "innkommende e-post"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr ""
-
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Feil gammelt passord"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt "
-"til din registrerte e-postadresse."
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
+msgid "Instructions for recovering your password have been sent to the email address registered to your account."
+msgstr "Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt til din registrerte e-postadresse."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Ugyldig avatar-URL '%s'"
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ugyldig hjemmeside '%s'"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr ""
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr ""
-
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr ""
-
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr ""
-
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Ugyldig profil-URL '%s'"
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr ""
-
 #: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
@@ -1105,190 +805,98 @@ msgstr "Ugyldig størrelse"
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn eller passord"
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, 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 ""
-
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
-#: ../actions/imsettings.php:62 actions/imsettings.php:63
-#, 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 ""
-
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Språk"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr ""
-
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr ""
-
 #: ../actions/login.php:97 ../actions/login.php:106
 #: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Logg inn"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Logg inn med en [OpenID](%%doc.openid%%)-konto."
 
-#: ../actions/login.php:126
-#, php-format
-msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
-"%). "
-msgstr ""
-
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Logg ut"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengre navn, helst ditt \"ekte\" navn"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Mistet eller glemt passordet?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Medlem siden"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Mikroblogg av %s"
 
-#: ../actions/smssettings.php:304
-#, 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 ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr ""
-
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Ny"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Nytt nick"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr ""
-
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nytt passord"
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr ""
-
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151 actions/login.php:101
 #: actions/profilesettings.php:74 actions/register.php:165
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Nick"
 
@@ -1297,72 +905,33 @@ msgstr "Nick"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Dette nicket er ikke tillatt"
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr ""
-
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Nick eller e-postadresse"
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr ""
-
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Ingen Jabber ID."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr ""
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr ""
-
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr ""
-
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Ingen e-postadresse."
 
@@ -1370,167 +939,24 @@ msgstr "Ingen e-postadresse."
 msgid "No id."
 msgstr "Ingen id."
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr ""
-
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr ""
-
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr ""
-
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr ""
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr ""
-
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr ""
-
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr ""
-
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr ""
-
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr ""
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-msgid "No such subscription"
-msgstr ""
-
-#: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
-#: actions/allrss.php:35 actions/avatarbynickname.php:43
-#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
-#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
-#: actions/replies.php:57 actions/repliesrss.php:35
-#: actions/showfavorites.php:34 actions/showstream.php:110
-#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
-#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
-#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
-#: lib/subs.php:33 lib/subs.php:95 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr ""
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr ""
-
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Ugyldig OpenID"
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Ugyldig e-postadresse"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Ugyldig e-postadresse."
 
@@ -1538,44 +964,19 @@ msgstr "Ugyldig e-postadresse."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
-
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:51
 #: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
 msgstr "Ikke autorisert."
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
 #: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
@@ -1588,95 +989,40 @@ msgstr ""
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Ikke logget inn."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr ""
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr ""
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr ""
-
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Gammelt passord"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr ""
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr ""
-
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID-URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 #, fuzzy
 msgid "OpenID authentication cancelled."
 msgstr "OpenID-autentifisering avbrutt."
 
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr ""
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
 #: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 #: actions/openidsettings.php:231
 msgid "OpenID removed."
@@ -1687,160 +1033,53 @@ msgstr "OpenID fjernet"
 msgid "OpenID settings"
 msgstr "Innstillinger for OpenID"
 
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
 #: ../actions/register.php:153 ../lib/settingsaction.php:93
 #: actions/finishopenidlogin.php:96 actions/login.php:102
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Passord"
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr ""
-
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Passordet må bestå av 6 eller flere tegn."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr ""
-
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Passordet ble lagret"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr ""
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr ""
-
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr ""
-
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/userauthorization.php:78
-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 \"Cancel\"."
-msgstr ""
-
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
-
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr ""
-
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr ""
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr ""
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr ""
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr ""
-
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profil"
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr ""
-
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr ""
-
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr ""
-
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr ""
-
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr ""
-
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser en MicroID for min e-postadresse."
 
@@ -1850,58 +1089,18 @@ msgid "Recent Tags"
 msgstr "Nyeste Tagger"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Gjenopprett"
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr ""
-
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr ""
-
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr ""
-
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Husk meg"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr ""
-
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/smssettings.php:50 ../actions/smssettings.php:84
@@ -1912,6 +1111,9 @@ msgstr ""
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1920,41 +1122,29 @@ msgstr "Fjern"
 msgid "Remove OpenID"
 msgstr "Fjern OpenID"
 
-#: ../actions/openidsettings.php:73
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Svar"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Svar til %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Nullstill"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr ""
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr ""
-
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "Telefonnummer for SMS"
 
@@ -1963,20 +1153,6 @@ msgstr "Telefonnummer for SMS"
 msgid "SMS Settings"
 msgstr "Innstillinger for SMS"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr ""
-
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr ""
-
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
 #: actions/emailsettings.php:104 actions/imsettings.php:82
@@ -1986,713 +1162,197 @@ msgstr ""
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Lagre"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Søk"
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr ""
-
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, 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 ""
-
-#: ../actions/peoplesearch.php:28
-#, 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 ""
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr ""
-
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Send"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr ""
-
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr ""
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr ""
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr ""
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Kilde"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr ""
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr ""
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr ""
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr ""
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr ""
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr ""
-
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Tagger"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Tekst"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Tekst-søk"
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr ""
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr ""
-
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr ""
-
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
 #: lib/imagefile.php:71
 msgid "That file is too big."
 msgstr "Den filen er for stor."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Det er allerede din Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Det er allerede din e-postadresse."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Det er allerede din ditt telefonnummer."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Det er ikke din Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Det er ikke din e-postadresse."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Det er ikke ditt telefonnummer."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Det er feil IM-adresse."
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr ""
-
-#: ../actions/userauthorization.php:312
-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:322
-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/subscribers.php:35 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr ""
-
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr ""
-
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr ""
-
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr ""
-
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr ""
-
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your OpenID "
-"to a local account. You can either create a new account, or connect with "
-"your existing account, if you have one."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr ""
-
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:43
-#, 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/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
-
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
-#: actions/emailsettings.php:144 actions/imsettings.php:118
-#: actions/recoverpassword.php:39 actions/smssettings.php:143
-#: actions/twittersettings.php:108 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr ""
-
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr ""
-
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr ""
-
-#: ../lib/util.php:269 lib/util.php:285
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr ""
-
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr ""
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr ""
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr ""
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr ""
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../actions/avatar.php:27
-msgid ""
-"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
-"you upload it, so make sure it's more or less square. It must be under the "
-"site license, also. Use a picture that belongs to you and that you want to "
-"share."
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
-#: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr ""
-
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82 actions/all.php:41
-#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
-#: actions/showfavorites.php:41 actions/showstream.php:44
-#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
-#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
-#: actions/twitapiusers.php:87 lib/mailbox.php:50
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr ""
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
-
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr ""
-
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Ja"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr ""
-
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
 msgstr "Du er allerede logget inn!"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr ""
-
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr ""
-
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
-msgstr ""
-
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about you."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr ""
-
-#: ../lib/mail.php:147
-#, 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 ""
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr ""
-
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr ""
-
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-
-#: ../actions/openidsettings.php:28
-#, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
-msgstr ""
-
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "noen få sekunder siden"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "omtrent %d dager siden"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "omtrent %d timer siden"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "omtrent %d minutter siden"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "omtrent %d måneder siden"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "omtrent én dag siden"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "omtrent ett minutt siden"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "omtrent én måned siden"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "omtrent ett år siden"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "omtrent én time siden"
 
@@ -2701,1127 +1361,151 @@ msgstr "omtrent én time siden"
 msgid "delete"
 msgstr "slett"
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr ""
-
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
 #: ../lib/stream.php:124 actions/noticesearch.php:143
 #: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
 msgstr "svar"
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr ""
-
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr ""
-
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr ""
-
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr ""
-
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr ""
-
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
-
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr ""
-
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr ""
-
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr ""
-
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr ""
-
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr ""
-
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr ""
-
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
-msgstr ""
-
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
-
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-msgstr ""
-
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr ""
-
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr ""
-
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr ""
-
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr ""
-
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr ""
-
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr ""
-
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr ""
-
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr ""
-
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
-
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr ""
-
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
-
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr ""
-
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr ""
-
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
-
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
-
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
-
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr ""
-
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr ""
-
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr ""
-
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr ""
-
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr ""
-
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr ""
-
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr ""
-
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr ""
-
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr ""
-
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
-
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr ""
-
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
-
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr ""
-
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr ""
-
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr ""
-
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr ""
-
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
-
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr ""
-
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr ""
-
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr ""
-
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr ""
-
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr ""
-
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr ""
-
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-msgstr ""
-
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr ""
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr ""
-
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr ""
-
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr ""
-
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr ""
-
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr ""
-
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
-
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-msgstr ""
-
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr ""
-
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr ""
-
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr ""
-
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr ""
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr ""
-
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr ""
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr ""
-
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr ""
-
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr ""
-
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr ""
-
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr ""
-
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr ""
-
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr ""
-
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr ""
-
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
-
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr ""
-
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr ""
-
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr ""
-
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr ""
-
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr ""
-
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr ""
-
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr ""
-
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr ""
-
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
-
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr ""
-
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
-
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
-
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
-
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr ""
-
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr ""
-
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr ""
-
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr ""
-
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr ""
-
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr ""
-
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr ""
-
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr ""
-
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr ""
-
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-msgstr ""
-
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr ""
-
-#: lib/mail.php:253 lib/mail.php:512
-#, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-msgstr ""
-
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr ""
-
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr ""
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr ""
-
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr ""
-
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr ""
-
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr ""
-
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr ""
-
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr ""
-
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr ""
-
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr ""
-
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr ""
-
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
+#, php-format, fuzzy
 msgid "%s and friends, page %d"
 msgstr "%s og venner"
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr ""
-
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "Innstillinger for IM"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr ""
-
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr ""
-
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr ""
-
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr ""
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr ""
-
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr ""
-
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "Klarte ikke å lagre profil."
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr ""
-
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
-
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
-
-#: actions/block.php:111
-msgid "Block user"
-msgstr ""
-
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr ""
-
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 #, fuzzy
 msgid "You have already blocked this user."
 msgstr "Du er allerede logget inn!"
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr ""
-
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr ""
-
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr ""
-
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr ""
-
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr ""
-
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr ""
-
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr ""
-
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "Nytt nick"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "Klarte ikke å lagre profil."
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr ""
-
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr ""
-
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr ""
-
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "Bioen er for lang (max 140 tegn)"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "Klarte ikke å oppdatere bruker."
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr ""
-
 #: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
+#, php-format, fuzzy
 msgid "Awaiting confirmation on this address. "
 msgstr "Venter på bekreftelse på dette telefonnummeret"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr ""
-
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr ""
-
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr ""
-
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr ""
-
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
-msgstr ""
-
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr ""
-
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr ""
-
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr ""
-
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr ""
-
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr ""
-
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr ""
-
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "Tidligere »"
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr ""
-
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
-
-#: actions/facebookinvite.php:96
-#, php-format
-msgid "You have been invited to %s"
-msgstr ""
-
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
+#, php-format, fuzzy
 msgid "Invite your friends to use %s"
 msgstr "Feed for %s sine venner"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
-
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
-msgstr ""
-
 #: actions/facebookremove.php:56
 #, fuzzy
 msgid "Couldn't remove Facebook user."
 msgstr "Klarte ikke å oppdatere bruker."
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr ""
-
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
 #: actions/facebooksettings.php:106
 #, fuzzy
 msgid "Prefix"
 msgstr "Profil"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr ""
-
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr ""
-
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr ""
-
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr ""
-
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr ""
-
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr ""
-
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr ""
-
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr ""
-
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
-msgstr ""
-
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr ""
-
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr ""
-
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr ""
-
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr ""
-
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "Avataren har blitt oppdatert."
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr ""
-
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr ""
-
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr ""
-
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr ""
-
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr ""
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr ""
-
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
-
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "Opprett en ny konto"
 
-#: actions/groupsearch.php:57
-#, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr ""
-
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "Tekst-søk"
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr ""
-
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr ""
-
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr ""
-
 #: actions/imsettings.php:321
-#, fuzzy, php-format
+#, php-format, fuzzy
 msgid "A confirmation code was sent "
 msgstr "Bekreftelseskode"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr ""
-
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Du er allerede logget inn!"
 
-#: actions/joingroup.php:128
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr ""
-
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
-msgstr ""
-
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr ""
-
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr ""
-
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "Klarte ikke å lagre profil."
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr ""
-
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr ""
-
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr ""
-
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
+#, php-format, fuzzy
 msgid "Could not remove user %s to group %s"
 msgstr "Klarte ikke å oppdatere bruker."
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
-msgstr ""
-
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr ""
-
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr ""
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr ""
-
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr ""
-
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Klarte ikke å lagre avatar-informasjonen"
@@ -3831,32 +1515,7 @@ msgstr "Klarte ikke å lagre avatar-informasjonen"
 msgid "That's too long. "
 msgstr "Den filen er for stor."
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr ""
-
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr ""
-
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr ""
-
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr ""
-
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr ""
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr ""
-
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "OpenID"
@@ -3871,24 +1530,13 @@ msgstr "Fjern OpenID"
 msgid "Other Settings"
 msgstr "Innstillinger for IM"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr ""
-
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr ""
-
 #: actions/othersettings.php:112
 #, fuzzy
 msgid "Service"
 msgstr "Søk"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr ""
-
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Bioen er for lang (max 140 tegn)"
@@ -3898,99 +1546,35 @@ msgstr "Bioen er for lang (max 140 tegn)"
 msgid "Change your password."
 msgstr "Endre passord"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "Passordet ble lagret"
 
-#: actions/peopletag.php:35
-#, fuzzy, php-format
+#: actions/peopletag.php:35 actions/peopletag.php:70
+#, php-format, fuzzy
 msgid "Not a valid people tag: %s"
 msgstr "Ugyldig e-postadresse"
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr ""
-
-#: actions/peopletag.php:91
-#, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr ""
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr ""
-
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr ""
-
 #: actions/profilesettings.php:144
 #, fuzzy
 msgid "Automatically subscribe to whoever "
 msgstr "Abonner "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
+#, php-format, fuzzy
 msgid "Invalid tag: \"%s\""
 msgstr "Ugyldig hjemmeside '%s'"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "Klarte ikke å lagre profil."
 
-#: actions/public.php:107
-#, php-format
-msgid "Public timeline, page %d"
-msgstr ""
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr ""
-
-#: actions/public.php:220
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
-msgstr ""
-
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr ""
-
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
-msgstr ""
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr ""
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr ""
-
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr ""
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr ""
-
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr ""
-
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr ""
-
 #: actions/register.php:398
 #, fuzzy
 msgid "URL of your homepage, blog, "
@@ -4001,165 +1585,48 @@ msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
 msgid "Describe yourself and your "
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr ""
-
-#: actions/register.php:432
-msgid " except this private data: password, "
-msgstr ""
-
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr ""
-
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr ""
-
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr ""
-
-#: actions/replies.php:118
-#, fuzzy, php-format
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
+#, php-format, fuzzy
 msgid "Replies to %s, page %d"
 msgstr "Svar til %s"
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
-msgstr ""
-
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
-msgstr ""
-
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
-msgstr ""
-
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "Klarte ikke å lagre profil."
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
-msgstr ""
-
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-msgid "Note"
-msgstr ""
-
-#: actions/showgroup.php:270
-msgid "Group actions"
-msgstr ""
-
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
-msgstr ""
-
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "Medlem siden"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr ""
-
-#: actions/showgroup.php:370
-msgid "All members"
-msgstr ""
-
-#: actions/showgroup.php:378
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
-msgstr ""
-
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr ""
-
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
-msgstr ""
-
 #: actions/showstream.php:143
 #, fuzzy
 msgid "'s profile"
 msgstr "Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "Klarte ikke å lagre profil."
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr ""
-
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr ""
-
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr ""
-
-#: actions/showstream.php:343
-msgid "Message"
-msgstr ""
-
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "Alle abonnementer"
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr ""
-
-#: actions/showstream.php:542
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
-msgstr ""
-
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr ""
-
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
-msgstr ""
-
 #: actions/smssettings.php:335
 #, fuzzy
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Venter på bekreftelse på dette telefonnummeret"
 
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
-msgstr ""
-
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
-msgstr ""
-
 #: actions/subedit.php:83
 #, fuzzy
 msgid "Could not save subscription."
@@ -4170,74 +1637,34 @@ msgstr "Klarte ikke å lagre avatar-informasjonen"
 msgid "Not a local user."
 msgstr "Ugyldig OpenID"
 
-#: actions/subscribe.php:69
-msgid "Subscribed"
-msgstr ""
-
-#: actions/subscribers.php:50
-#, php-format
-msgid "%s subscribers"
-msgstr ""
-
-#: actions/subscribers.php:52
-#, php-format
-msgid "%s subscribers, page %d"
-msgstr ""
-
-#: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr ""
-
-#: actions/subscribers.php:67
-#, php-format
-msgid "These are the people who "
-msgstr ""
-
 #: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format, fuzzy
 msgid "%s subscriptions"
 msgstr "Alle abonnementer"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format, fuzzy
 msgid "%s subscriptions, page %d"
 msgstr "Alle abonnementer"
 
-#: actions/subscriptions.php:65
-msgid "These are the people whose notices "
-msgstr ""
-
-#: actions/subscriptions.php:69
-#, php-format
-msgid "These are the people whose "
-msgstr ""
-
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "Ingen Jabber ID."
 
-#: actions/tag.php:43
-#, fuzzy, php-format
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
+#, php-format, fuzzy
 msgid "Notices tagged with %s, page %d"
 msgstr "Mikroblogg av %s"
 
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr ""
-
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
 msgstr "Ikke logget inn."
 
-#: actions/tagother.php:39
-msgid "No id argument."
-msgstr ""
-
 #: actions/tagother.php:65
-#, fuzzy, php-format
+#, php-format, fuzzy
 msgid "Tag %s"
 msgstr "Tagger"
 
@@ -4246,544 +1673,586 @@ msgstr "Tagger"
 msgid "Tag user"
 msgstr "Tagger"
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
-msgstr ""
-
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr ""
-
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
-msgstr ""
-
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
-
-#: actions/tagrss.php:35
-msgid "No such tag."
-msgstr ""
-
-#: actions/tagrss.php:66
-#, fuzzy, php-format
+#: actions/tagrss.php:66 actions/tagrss.php:64
+#, php-format, fuzzy
 msgid "Microblog tagged with %s"
 msgstr "Mikroblogg av %s"
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr ""
-
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr ""
-
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "Ingen id."
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr ""
-
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr ""
-
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 #, fuzzy
 msgid "Twitter password"
 msgstr "Nytt passord"
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr ""
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
+#, fuzzy
+msgid "Account"
+msgstr "Om"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr ""
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
+#, fuzzy
+msgid "Create an account"
+msgstr "Opprett en ny konto"
 
-#: actions/twittersettings.php:341
-#, php-format
-msgid "Unable to retrieve account information "
-msgstr ""
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
+#, fuzzy
+msgid "Help me!"
+msgstr "Hjelp"
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr ""
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
+#, fuzzy
+msgid " a new account."
+msgstr "Opprett en ny konto"
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr ""
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
+#, fuzzy
+msgid "Published"
+msgstr "Offentlig"
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr ""
+#: lib/galleryaction.php:121
+#, fuzzy
+msgid "Filter tags"
+msgstr "Feed for taggen %s"
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr ""
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
+#, fuzzy
+msgid "Tag"
+msgstr "Tagger"
 
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr ""
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
 
-#: actions/usergroups.php:65
-#, php-format
-msgid "%s groups, page %d"
-msgstr ""
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Alle abonnementer"
 
-#: classes/Notice.php:104
-msgid "Problem saving notice. Unknown user."
-msgstr ""
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
-#: classes/Notice.php:109
-msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
+#: lib/groupnav.php:106 lib/groupnav.php:112
+#, fuzzy
+msgid "Logo"
+msgstr "Logg ut"
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
-msgstr ""
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Logg inn"
 
-#: lib/accountsettingsaction.php:108
-msgid "Upload an avatar"
-msgstr ""
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Lagre"
 
-#: lib/accountsettingsaction.php:119
-msgid "Other"
-msgstr ""
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Ugyldig brukernavn eller passord"
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
-msgstr ""
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Opprett en ny konto"
 
-#: lib/action.php:130
-#, php-format
-msgid "%s - %s"
-msgstr ""
+#: lib/mail.php:256 lib/mail.php:255
+#, php-format, fuzzy
+msgid "Homepage: %s\n"
+msgstr "Hjemmesiden: %s\n"
 
-#: lib/action.php:145
-msgid "Untitled page"
-msgstr ""
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
+#, fuzzy
+msgid "Available characters"
+msgstr "6 eller flere tegn"
 
-#: lib/action.php:316
-msgid "Primary site navigation"
-msgstr ""
+#: lib/noticelist.php:426 lib/noticelist.php:429
+#, fuzzy
+msgid "in reply to"
+msgstr "svar"
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
-msgstr ""
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
+#, fuzzy
+msgid "Reply"
+msgstr "svar"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr ""
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete"
+msgstr "slett"
 
-#: lib/action.php:328
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 #, fuzzy
-msgid "Account"
-msgstr "Om"
+msgid "Public"
+msgstr "Offentlig"
 
-#: lib/action.php:328
-msgid "Change your email, avatar, password, profile"
-msgstr ""
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+#, fuzzy
+msgid "Recent tags"
+msgstr "Nyeste Tagger"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr ""
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
+#, php-format, fuzzy
+msgid "People subscribed to %s"
+msgstr "Svar til %s"
 
-#: lib/action.php:332
-msgid "Logout from the site"
-msgstr ""
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, php-format, fuzzy
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed for %s sine venner"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr ""
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, php-format, fuzzy
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed for %s sine venner"
 
-#: lib/action.php:338
-#, fuzzy
-msgid "Create an account"
-msgstr "Opprett en ny konto"
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, php-format, fuzzy
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed for %s sine venner"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr ""
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s og venner"
 
-#: lib/action.php:344
+#: actions/avatarsettings.php:373
 #, fuzzy
-msgid "Help me!"
-msgstr "Hjelp"
+msgid "Avatar deleted."
+msgstr "Brukerbildet har blitt oppdatert."
 
-#: lib/action.php:362
-msgid "Site notice"
-msgstr ""
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, php-format, fuzzy
+msgid "Microblog by %s group"
+msgstr "Mikroblogg av %s"
 
-#: lib/action.php:417
-msgid "Local views"
-msgstr ""
+#: actions/noticesearch.php:91
+#, php-format, fuzzy
+msgid "Search results for \"%s\" on %s"
+msgstr "Søkestrøm for «%s»"
 
-#: lib/action.php:472
-msgid "Page notice"
-msgstr ""
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "%s offentlig strøm"
 
-#: lib/action.php:562
-msgid "Secondary site navigation"
-msgstr ""
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid " except this private data: password, email address, IM address, and phone number."
+msgstr "utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og telefonnummer."
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
-msgstr ""
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Opprett"
 
-#: lib/action.php:630
-msgid "All "
-msgstr ""
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Klarte ikke å lagre profil."
 
-#: lib/action.php:635
-msgid "license."
-msgstr ""
+#: actions/showstream.php:149
+#, php-format, fuzzy
+msgid "%s's profile"
+msgstr "Profil"
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr ""
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format, fuzzy
+msgid "FOAF for %s"
+msgstr "Feed for taggen %s"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr ""
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Brukerbilde"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr ""
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Endre profilinnstillingene dine"
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr ""
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. Check your phone for the code and instructions on how to use it."
+msgstr "En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen din for koden, og hvordan du skal bruke den."
 
-#: lib/facebookaction.php:271
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
 #, fuzzy
-msgid " a new account."
-msgstr "Opprett en ny konto"
+msgid "No such user!"
+msgstr "Klarte ikke å lagre profil."
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/mail.php:241 lib/mail.php:240
+#, php-format, fuzzy
+msgid "%1$s is now listening to your notices on %2$s.\n\n	%3$s\n\n%4$s%5$s%6$s\nFaithfully yours,\n%7$s.\n\n----\nChange your email address or notification options at %8$s\n"
+msgstr "%1$s lytter nå til dine notiser på %2$s.\n\n	%3$s\n\nVennlig hilsen,\n%4$s.\n"
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
 #, fuzzy
-msgid "Published"
-msgstr "Offentlig"
+msgid "Search site"
+msgstr "Søk"
 
-#: lib/favorform.php:114 lib/favorform.php:140
-msgid "Favor this notice"
-msgstr ""
+#: actions/blockedfromgroup.php:90
+#, php-format, fuzzy
+msgid "%s blocked profiles"
+msgstr "Klarte ikke å lagre profil."
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
+#: actions/blockedfromgroup.php:93
+#, php-format, fuzzy
+msgid "%s blocked profiles, page %d"
+msgstr "%s og venner"
 
-#: lib/galleryaction.php:121
+#: actions/conversation.php:99
 #, fuzzy
-msgid "Filter tags"
-msgstr "Feed for taggen %s"
-
-#: lib/galleryaction.php:131
-msgid "All"
-msgstr ""
+msgid "Conversation"
+msgstr "Bekreftelseskode"
 
-#: lib/galleryaction.php:137
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
 #, fuzzy
-msgid "Tag"
-msgstr "Tagger"
+msgid "Do not delete this notice"
+msgstr "Kan ikke slette notisen."
 
-#: lib/galleryaction.php:138
-msgid "Choose a tag to narrow list"
-msgstr ""
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, php-format, fuzzy
+msgid "Invalid alias: \"%s\""
+msgstr "Ugyldig hjemmeside '%s'"
 
-#: lib/galleryaction.php:139
-msgid "Go"
-msgstr ""
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, php-format, fuzzy
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Det nicket er allerede i bruk. Prøv et annet."
 
-#: lib/groupeditform.php:148
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
 #, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
-msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
+msgid "Could not create aliases."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: lib/groupeditform.php:151
+#: actions/file.php:34
 #, fuzzy
-msgid "Description"
-msgstr "Alle abonnementer"
+msgid "No notice id"
+msgstr "Nytt nick"
 
-#: lib/groupeditform.php:153
+#: actions/file.php:38
 #, fuzzy
-msgid "Describe the group or topic in 140 chars"
-msgstr "Beskriv degselv og dine interesser med 140 tegn"
+msgid "No notice"
+msgstr "Nytt nick"
 
-#: lib/groupeditform.php:158
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr ""
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Ugyldig nick."
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
-msgstr ""
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Du er allerede logget inn!"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr ""
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: lib/groupnav.php:101
-#, php-format
-msgid "Edit %s group properties"
-msgstr ""
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Klarte ikke å lagre profil."
 
-#: lib/groupnav.php:106
+#: actions/recoverpassword.php:152
 #, fuzzy
-msgid "Logo"
-msgstr "Logg ut"
+msgid "If you've forgotten or lost your password, you can get a new one sent to the email address you have stored in your account."
+msgstr "Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt til din registrerte e-postadresse."
 
-#: lib/groupnav.php:107
-#, php-format
-msgid "Add or edit %s logo"
-msgstr ""
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Passordet ble lagret"
 
-#: lib/groupsbymemberssection.php:71
-msgid "Groups with most members"
-msgstr ""
+#: actions/showfavorites.php:79
+#, php-format, fuzzy
+msgid "%s's favorite notices, page %d"
+msgstr "%s og venner"
 
-#: lib/groupsbypostssection.php:71
-msgid "Groups with most posts"
-msgstr ""
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Ugyldig OpenID"
 
-#: lib/grouptagcloudsection.php:56
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr ""
+#: actions/showstream.php:72
+#, php-format, fuzzy
+msgid " tagged %s"
+msgstr "Tagger"
 
-#: lib/htmloutputter.php:104
-msgid "This page is not available in a "
-msgstr ""
+#: actions/subscriptions.php:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, php-format, fuzzy
+msgid "%s is not listening to anyone."
+msgstr "%1$s lytter nå til dine notiser på %2$s."
 
-#: lib/joinform.php:114
-#, fuzzy
-msgid "Join"
-msgstr "Logg inn"
+#: actions/tag.php:91 actions/tag.php:98
+#, php-format, fuzzy
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed for taggen %s"
 
-#: lib/leaveform.php:114
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
 #, fuzzy
-msgid "Leave"
-msgstr "Lagre"
+msgid "This status is already a favorite!"
+msgstr "Det er allerede din e-postadresse."
 
-#: lib/logingroupnav.php:76
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
 #, fuzzy
-msgid "Login with a username and password"
-msgstr "Ugyldig brukernavn eller passord"
+msgid "Could not determine source user."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: lib/logingroupnav.php:79
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
 #, fuzzy
-msgid "Sign up for a new account"
-msgstr "Opprett en ny konto"
-
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr ""
+msgid "Could not find target user."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: lib/mail.php:175
-#, php-format
-msgid ""
-"Hey, %s.\n"
-"\n"
-msgstr ""
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, php-format, fuzzy
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Oppdateringer som svarer til %2$s"
 
-#: lib/mail.php:236
-#, php-format
-msgid "%1$s is now listening to "
-msgstr ""
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, php-format, fuzzy
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Mikroblogg av %s"
 
-#: lib/mail.php:254
-#, php-format
-msgid "Location: %s\n"
-msgstr ""
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Alle abonnementer"
 
-#: lib/mail.php:256
-#, fuzzy, php-format
-msgid "Homepage: %s\n"
-msgstr "Hjemmesiden: %s\n"
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profil"
 
-#: lib/mail.php:258
-#, php-format
-msgid ""
-"Bio: %s\n"
-"\n"
-msgstr ""
+#: actions/usergroups.php:153
+#, php-format, fuzzy
+msgid "%s is not a member of any group."
+msgstr "Du er allerede logget inn!"
 
-#: lib/mail.php:461
-#, php-format
-msgid "You've been nudged by %s"
-msgstr ""
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Klarte ikke å lagre profil."
 
-#: lib/mail.php:465
-#, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr ""
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profil"
 
-#: lib/mail.php:555
-#, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr ""
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Last opp"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr ""
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Endre passordet ditt"
 
-#: lib/messageform.php:110
-msgid "Send a direct notice"
-msgstr ""
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Koble til"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr ""
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Søk"
 
-#: lib/noticeform.php:152
+#: lib/designsettings.php:230
 #, fuzzy
-msgid "Available characters"
-msgstr "6 eller flere tegn"
+msgid "Links"
+msgstr "Logg inn"
 
-#: lib/noticelist.php:426
+#: lib/searchaction.php:156 lib/searchaction.php:162
 #, fuzzy
-msgid "in reply to"
-msgstr "svar"
+msgid "Search help"
+msgstr "Søk"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
-msgid "Reply to this notice"
-msgstr ""
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Klarte ikke å lagre profil."
 
-#: lib/noticelist.php:451
+#: actions/apifriendshipsdestroy.php:109
 #, fuzzy
-msgid "Reply"
-msgstr "svar"
+msgid "Could not unfollow user: User not found."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr ""
+#: actions/apigroupcreate.php:261
+#, php-format, fuzzy
+msgid "Description is too long (max %d chars)."
+msgstr "Bioen er for lang (max 140 tegn)"
 
-#: lib/noticelist.php:474
+#: actions/apigroupjoin.php:110
 #, fuzzy
-msgid "Delete"
-msgstr "slett"
-
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
-msgstr ""
+msgid "You are already a member of that group."
+msgstr "Du er allerede logget inn!"
 
-#: lib/nudgeform.php:128
-msgid "Nudge"
-msgstr ""
+#: actions/apigroupjoin.php:138
+#, php-format, fuzzy
+msgid "Could not join user %s to group %s."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr ""
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Du er allerede logget inn!"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr ""
+#: actions/apigroupleave.php:124
+#, php-format, fuzzy
+msgid "Could not remove user %s to group %s."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr ""
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, php-format, fuzzy
+msgid "description is too long (max %d chars)."
+msgstr "Bioen er for lang (max 140 tegn)"
 
-#: lib/publicgroupnav.php:76
+#: actions/finishremotesubscribe.php:106
 #, fuzzy
-msgid "Public"
-msgstr "Offentlig"
-
-#: lib/publicgroupnav.php:80
-msgid "User groups"
-msgstr ""
+msgid "You are not authorized."
+msgstr "Ikke autorisert."
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: actions/getfile.php:75
 #, fuzzy
-msgid "Recent tags"
-msgstr "Nyeste Tagger"
+msgid "No such file."
+msgstr "Klarte ikke å lagre profil."
 
-#: lib/publicgroupnav.php:86
-msgid "Featured"
-msgstr ""
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Klarte ikke å lagre profil."
 
-#: lib/publicgroupnav.php:90
-msgid "Popular"
-msgstr ""
+#: actions/noticesearchrss.php:91
+#, php-format, fuzzy
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Alle oppdateringer for søket: «%s»"
 
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr ""
+#: actions/profilesettings.php:122 actions/register.php:454
+#, php-format, fuzzy
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
-#: lib/searchgroupnav.php:85
-msgid "Find groups on this site"
-msgstr ""
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
-#: lib/section.php:89
-msgid "Untitled section"
-msgstr ""
+#: actions/profilesettings.php:221 actions/register.php:217
+#, php-format, fuzzy
+msgid "Bio is too long (max %d chars)."
+msgstr "«Om meg» er for lang (maks 140 tegn)."
 
-#: lib/subgroupnav.php:81
-#, php-format
-msgid "People %s subscribes to"
-msgstr ""
+#: actions/replies.php:158
+#, php-format, fuzzy
+msgid "Replies feed for %s (Atom)"
+msgstr "Svar til %s"
 
-#: lib/subgroupnav.php:89
-#, fuzzy, php-format
-msgid "People subscribed to %s"
+#: actions/repliesrss.php:72
+#, php-format, fuzzy
+msgid "Replies to %1$s on %2$s!"
 msgstr "Svar til %s"
 
-#: lib/subgroupnav.php:97
-#, php-format
-msgid "Groups %s is a member of"
-msgstr ""
+#: actions/showfavorites.php:170
+#, php-format, fuzzy
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed for %s sine venner"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+#: actions/showfavorites.php:177
+#, php-format, fuzzy
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed for %s sine venner"
 
-#: lib/subs.php:53
-msgid "User has blocked you."
-msgstr ""
+#: actions/showfavorites.php:184
+#, php-format, fuzzy
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed for %s sine venner"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr ""
+#: actions/showgroup.php:345
+#, php-format, fuzzy
+msgid "FOAF for %s group"
+msgstr "Klarte ikke å lagre profil."
 
-#: lib/tagcloudsection.php:56
-msgid "None"
-msgstr ""
+#: actions/userauthorization.php:343
+#, php-format, fuzzy
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Kan ikke lese brukerbilde-URL «%s»"
 
-#: lib/topposterssection.php:74
-msgid "Top posters"
-msgstr ""
+#: lib/command.php:88
+#, php-format, fuzzy
+msgid "Could not find a user with nickname %s"
+msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr ""
+#: lib/command.php:439
+#, php-format, fuzzy
+msgid "Reply to %s sent"
+msgstr "Svar til %s"
 
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr ""
+#: lib/common.php:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Fant ikke bekreftelseskode."
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
-msgstr ""
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
+#: lib/groupeditform.php:170
+#, php-format, fuzzy
+msgid "Describe the group or topic in %d characters"
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Opprett en ny konto"
+msgid "from"
+msgstr "fra"
 
-#~ msgid " by "
-#~ msgstr "av"
diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo
index 122a49285..269fac730 100644
--- a/locale/nl/LC_MESSAGES/statusnet.mo
+++ b/locale/nl/LC_MESSAGES/statusnet.mo
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 6cc0a52c4..b2a64da2f 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -1,30 +1,30 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Dutch
 #
+# Author@translatewiki.net: Siebrand
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-07-11 00:23+0000\n"
-"Last-Translator: Ben van Es van Conkelenberghe <ben@ikhier.be>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:14+0000\n"
+"Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr "Doorzoek de stroom naar \"%s\""
+msgstr " Stroom doorzoeken naar \"%s\""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -37,17 +37,19 @@ msgid " from "
 msgstr " van "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Updates antwoordend op %2$s"
+msgstr "%1$s / Updates in antwoord op %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s heeft je uitgenodigd voor %2$s"
+msgstr "%1$s heeft u uitgenodigd voor %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -77,37 +79,38 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
-"%1$s heeft je uitgenodigd voor %2$s (%3$s).\n"
+"%1$s heeft u uitgenodigd voor %2$s (%3$s).\n"
 "\n"
-"%2$s is een micro-blog service waarmee je mensen op de hoogte kunt houden "
-"van wat jou interesseerd en bezig houdt.\n"
+"%2$s is een microblogdienst waarmee u mensen op de hoogte kunt houden van "
+"wat u interesseert en bezig houdt.\n"
 "\n"
-"Je kunt ook nieuws over jezelf of jouw hersenspinsels met anderen delen. Het "
-"is ook de ideale plek om mensen te ontmoeten met dezelfde interesses als "
-"jij.\n"
+"U kunt ook nieuws over uzelf of uw ideeën en gedachten met anderen delen. "
+"Het is ook de ideale plek om mensen te ontmoeten met dezelfde interesses als "
+"u.\n"
 "\n"
-"%1$s zei:\n"
+"%1$s schreef:\n"
 "\n"
 "%4$s\n"
 "\n"
-"Je kunt %1$s's profiel pagina op %2$s hier bekijken:\n"
+"U kunt %1$s's profielpagina op %2$s hier bekijken:\n"
 "\n"
 "%5$s\n"
 "\n"
-"Als je het wilt proberen, klik dan op de link hieronder om de uitnodiging te "
-"accepteren.\n"
+"Als u het wilt proberen, klik dan op de verwijzing hieronder om de "
+"uitnodiging te accepteren.\n"
 "\n"
 "%6$s\n"
 "\n"
-"Als je geen interesse hebt, kun je dit bericht gewoon negeren. Bedankt voor "
-"je geduld.\n"
+"Als u geen interesse hebt, kunt u dit bericht negeren. Bedankt voor uw "
+"geduld.\n"
 "\n"
 "Met vriendelijke groet, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s volgt nu je berichten %2$s."
+msgstr "%1$s volgt nu uw berichten %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
@@ -119,7 +122,7 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"%1$s volgt nu je berichten op %2$s.\n"
+"%1$s volgt nu uw berichten op %2$s.\n"
 "\n"
 "\t%3$s\n"
 "\n"
@@ -127,82 +130,101 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr "%1$s's status op %2$s"
+msgstr "Status van %1$s op %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
-msgstr "%s rss"
+msgstr "%s publieke stream"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
 #: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s en vrienden"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
-msgstr ""
+msgstr "%s publieke tijdlijn"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
-msgstr ""
+msgstr "%s tijdlijn"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s updates van iedereen"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
-"(U ontvangt een bericht per e-mail  met instructies over: hoe te bevestigen "
-"dat uw e-mailadres.)"
+"U ontvangt snel een e-mailbericht  met daarin instructies over hoe u uw e-"
+"mail kunt bevestigen."
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** is een microbloggingdienst van [%%site.broughtby%%](%%site."
+"**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site."
 "broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** is een microbloggingdienst. "
+msgstr "**%%site.name%%** is een microblogdienst. "
 
 #: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
@@ -213,39 +235,44 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
-msgstr "6 of meer tekens"
+msgstr "Zes of meer tekens"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 of meer tekens, en vergeet het niet!"
+msgstr "Zes of meer tekens, en vergeet uw wachtwoord niet!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
-msgstr "6 of meer tekens. Verplicht"
+msgstr "Zes of meer tekens. Verplicht"
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
-"Een bevestigingscode is verstuurd naar het opgegeven IM-adres. Je moet ermee "
-"akkoord gaan dat %s boodschappen aan jou stuurt."
+"Er is een bevestigingscode verstuurd naar het opgegeven IM-adres. U moet "
+"ermee akkoord gaan dat %s berichten aan u verzendt."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -259,9 +286,8 @@ msgid ""
 "A confirmation code was sent to the phone number you added. Check your inbox "
 "(and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"Een bevestigingscode is verzonden naar het telefoonnummer dat u hebt "
-"toegevoegd. Controleer uw inbox (en spam box!) Voor de code en instructies "
-"hoe het te gebruiken."
+"Er is een bevestigingscode verzonden naar het telefoonnummer dat u hebt "
+"toegevoegd. Controleer uw inbox (en spambox!) voor de code en instructies."
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -281,9 +307,36 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
-msgstr "API functie niet gevonden"
+msgstr "De API-functie is niet aangetroffen!"
 
 #: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
 #: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -304,19 +357,25 @@ msgstr "API functie niet gevonden"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
-msgstr "API functie in bewerking"
+msgstr "De API-functie is in bewerking."
 
-#  This would be appropriate for the footer menu link (actual context isn't clear!)
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Over"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
-msgstr "Accepteer"
+msgstr "Aanvaarden"
 
 #: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
 #: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
@@ -325,44 +384,49 @@ msgstr "Accepteer"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
-msgstr "Voeg toe"
+msgstr "Toevoegen"
 
 #: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 #: actions/openidsettings.php:93
 msgid "Add OpenID"
-msgstr "Voeg OpenID toe"
+msgstr "OpenID toevoegen"
 
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 #: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
-msgstr "Toevoegen en verwijderen van je OpenIDs"
+msgstr "OpenID's toevoegen en verwijderen"
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Adres"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
-msgstr "Adressen van je vrienden om uit te nodigen (1 per regel)"
+msgstr "Adressen van uit te nodigen vrienden (één per regel)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Alle abonnementen"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Alle updates voor %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Alle updates die overeenkomen met de zoekterm \"%s\""
@@ -372,148 +436,171 @@ msgstr "Alle updates die overeenkomen met de zoekterm \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
-msgstr "Al ingelogd."
+msgstr "U bent al aangemeld."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
-msgstr "Al geabonneerd!"
+msgstr "U bent al geabonneerd!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
-msgstr "Weet u zeker dat u  deze aankondiging wilt verwijderen?"
+msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
-msgstr "Sta abonnement toe"
+msgstr "Abonneren"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "Voortaan automatisch inloggen; niet voor gemeenschappelijke computers!"
+msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"Automatisch een abonnement op wie abonneerd op mij (beste voor niet-mensen)"
+"Automatisch abonneren bij abonnement op mij (beste voor automatische "
+"processen)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
-msgstr "Avatar geactualiseerd."
+msgstr "De avatar is bijgewerkt."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, 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 ""
-"Wacht op bevestiging van dit adres. Controleer je Jabber/GTalk account op "
-"een boodschap met nadere instructies. (Heb je %s aan je contactenlijst "
-"toegevoegd?)"
+"Er wordt gewacht op bevestiging van dit adres. Controleer uw Jabber/GTalk-"
+"gebruiker op een bericht met nadere instructies. Hebt u %s aan uw "
+"contactenlijst toegevoegd?"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
-"Wacht op bevestiging van dit adres. Controleer je mailbox en ook je spambox "
-"voor een bericht met verdere instructies. "
+"Er wordt gewacht op bevestiging van dit adres. Controleer uw inbox en uw "
+"spambox voor een bericht met nadere instructies."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
-msgstr "Afwachtend op bevestiging van dit telefoonnummer"
+msgstr "Er wordt gewacht op bevestiging van dit telefoonnummer."
 
 #: ../lib/util.php:1318 lib/util.php:1452
 msgid "Before »"
-msgstr "Eerder »"
+msgstr "Voor »"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
-msgstr "Biografie"
+msgstr "Beschrijving"
 
 #: ../actions/profilesettings.php:101 ../actions/register.php:82
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
-msgstr "Biografie is te lang (maximaal 140 tekens)"
+msgstr "De beschrijving is te lang (maximaal 140 tekens)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
-msgstr "Kan dit bericht niet verwijderen."
+msgstr "Deze mededeling kan niet verwijderd worden."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr "Kan avatar-URL '%s' niet lezen"
+msgstr "Het was niet mogelijk de avatar-URL \"%s\" te lezen."
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
-msgstr "Kan nieuw wachtwoord niet opslaan."
+msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
-msgstr "Annuleer"
+msgstr "Annuleren"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
-msgstr "Kan OpenID-consumerobject niet instantiëren."
+msgstr "Het was niet mogelijk uw OpenID te verwerken."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
-msgstr "Kan die Jabber-ID niet normaliseren"
+msgstr "Het was niet mogelijk om het Jabber-ID te normaliseren"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Kan het emailadres niet normaliseren"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
-msgstr "Wijzig"
+msgstr "Wijzigen"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
-msgstr "Wijzigen e-mail afhandeling"
+msgstr "E-mailafhandeling wijzigen"
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
 #: actions/passwordsettings.php:58
 msgid "Change password"
-msgstr "Wijzig wachtwoord"
+msgstr "Wachtwoord wijzigen"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
-msgstr "Wijzig jouw wachtwoord"
+msgstr "Uw wachtwoord wijzigen"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
-msgstr "Wijzig jouw profiel gegevens"
+msgstr "Uw profielgegevens wijzigen"
 
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -521,33 +608,39 @@ msgstr "Wijzig jouw profiel gegevens"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
-msgstr "Bevestig"
+msgstr "Bevestigen"
 
 #: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 #: actions/confirmaddress.php:144
 msgid "Confirm Address"
-msgstr "Bevestig adres"
+msgstr "Adres bevestigen"
 
 #: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Bevestiging geannuleerd."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Bevestigingscode"
 
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
-msgstr "Bevestigingscode niet gevonden."
+msgstr "De bevestigingscode niet gevonden."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -565,89 +658,96 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Gefeliciteerd, %s! Welkom op de site:  %%%%site.name%%%%. Vanaf hier je zult "
-"misschien....\n"
+"Gefeliciteerd, %s! Welkom bij  %%%%site.name%%%%. Hier staan aan aantal "
+"handelingen die u wellicht uit wilt voeren:\n"
 "\n"
-"* Naar je [profiel](%s) gaan en je eerste bericht posten.\n"
-"* een adres [Jabber/GTalk](%%%%action.imsettings%%%%) toevoegen zodat je "
-"vandaaruit berichten kan verzenden.\n"
-"* [Op zoek naar mensen](%%%%action.peoplesearch%%%%) die je misschien kent "
-"en / of dezelfde interesse hebben of uit dezelfde plaats komen. \n"
-"* Bijwerken van [je profiel](%%%%action.profilesettings%%%%) om andere meer "
-"van jezelf te vertellen en een leuke foto te uploaden. \n"
-"* Lees ook even de [online documenten](%%%%doc.help%%%%) met alle "
-"mogelijkheden en hulp \n"
+"* Naar uw [profiel](%s) gaan en uw eerste bericht verzenden;\n"
+"* Een [Jabber/GTalk-adres](%%%%action.imsettings%%%%) toevoegen zodat u "
+"vandaaruit mededelingen kunt verzenden;\n"
+"* [Gebruikers zoeken](%%%%action.peoplesearch%%%%) die u al kent of waarmee "
+"u interesses deelt;\n"
+"* [Uw profiel](%%%%action.profilesettings%%%%) bijwerken om anderen meer "
+"over uzelf te vertellen;\n"
+"* De [online documentatie](%%%%doc.help%%%%) raadplegen voor mogelijkheden "
+"die u nog niet kent.\n"
 "\n"
-"Dank je wel voor het inschrijven op onze site en we hoen dat je een hele "
-"leuke tijd hebt met deze service."
+"Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
+"ervan verwacht."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
-msgstr "Koppel"
+msgstr "Koppelen"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
-msgstr "Koppel bestaand account"
+msgstr "Bestaande gebruiker koppelen"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Contact"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
-msgstr "Kan geen OpenID aanmaken van: %s"
+msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s"
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr "je kan deze persoon %s niet volgen omdat deze al je vriend is"
+msgstr "U kunt de gebruiker %s niet volgen, omdat deze al op uw lijst staat."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
-msgstr "Je kan de gebruiker niet volgen, we hebben deze gebruiker niet gevonden"
+msgstr "U kunt de gebruiker %s niet volgen, omdat deze gebruiker niet bestaat."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
-msgstr "Kon niet omleiden naar service: %s"
+msgstr "Het was niet mogelijk om door te verwijzen naar de server: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
-msgstr "Kon avatar informatie niet opslaan"
+msgstr "De avatarinformatie kon niet opgeslagen worden"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
-msgstr "Kon de nieuwe profiel informatie niet opslaan"
+msgstr "De nieuwe profielinformatie kon niet opgeslagen worden"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
-msgstr "Kan geen abonnee toewijzen aan je"
+msgstr "Het was niet mogelijk om een ander op u te laten abonneren"
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Kan niet abonneren "
 
 #: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr "Kan de gebruiker niet aan het bevestigde mailadres bijwerken"
+msgstr ""
+"Het was niet mogelijk het bevestigde e-mailadres voor de gebruiker bij te "
+"werken."
 
-# tokens zou vervangen moeten worden dus
-# tokens need to be replaced
 #: ../actions/finishremotesubscribe.php:99
 #: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-#, fuzzy
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
-"Kan niet converteren verzoek om tokens om toegang te krijgen tot de tokens"
+"Het was niet mogelijk de verzoekentokens om te zetten naar toegangstokens."
 
 #: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
@@ -655,52 +755,63 @@ msgstr ""
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
-msgstr "Kon e-mailbevestiging niet verwijderen."
+msgstr "De e-mailbevestiging kon niet verwijderd worden."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Kon abonnement niet verwijderen."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Kan geen ene status vinden"
 
-# Token need to be replaced
 #: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
 #: actions/remotesubscribe.php:178
-#, fuzzy
 msgid "Couldn't get a request token."
-msgstr "Kan geen verzoek om token krijgen"
+msgstr "Het was niet mogelijk een verzoektoken te krijgen."
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
-msgstr "Kon bevestigingscode niet toevoegen"
+msgstr "De bevestigingscode kon niet ingevoegd worden."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Kon nieuw abonnement niet toevoegen."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
-msgstr "Kon profiel niet opslaan."
+msgstr "Het profiel kon niet opgeslagen worden."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
-msgstr "kan de automatische inschrijving niet verwerken"
+msgstr ""
+"Het was niet mogelijk de instelling voor automatisch abonneren voor de "
+"gebruiker bij te werken."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Kan de gebruikersgegevens niet vernieuwen"
 
@@ -716,166 +827,193 @@ msgstr "Kan de gebruikersgegevens niet vernieuwen"
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Kon gebruiker niet actualiseren."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Aanmaken"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
-msgstr "Maak een nieuwe gebruiker aan met deze gebruikersnaam."
+msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
-msgstr "Maak een nieuw account aan"
+msgstr "Nieuw gebruiker aanmaken"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
-"Bezig nieuw account aan te maken voor OpenID waarvoor al een "
-"gebruikersaccount bestaat."
+"Bezig met het aanmaken van een nieuwe OpenID-gebruiker bij een bestaande "
+"gebruiker."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
-msgstr "Huidig bevestigd Jabber/GTalk adres."
+msgstr "Huidige bevestigde Jabber/GTalk adres."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
-msgstr "Huidig bevestigd SMS-ingevoerd telefoonnummer."
+msgstr "Huidige bevestigde telefoonnummer met SMS-functie."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
-msgstr "Huidig bevestigd emailadres"
+msgstr "Huidige bevestigde e-mailadres"
 
 #: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "Op dit moment"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
-msgstr "Database fout van de invoer hashtag: %s"
+msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
-msgstr "Database-fout bij toevoegen antwoord: %s"
+msgstr ""
+"Er is een databasefout opgetreden bij het invoegen van het antwoord: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
-msgstr "Verwijderd bericht"
+msgstr "Mededeling verwijderen"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
-msgstr "Beschrijf jezelf en je interesses in 140 tekens"
+msgstr "Beschrijf uzelf en uw interesses in 140 tekens"
 
 #: ../actions/register.php:158 ../actions/register.php:161
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "E-mail"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
-msgstr "Email adres"
+msgstr "E-mailadres"
 
 #: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 #: actions/emailsettings.php:60
 msgid "Email Settings"
-msgstr "Email instellingen"
+msgstr "E-mailinstellingen"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
-msgstr "E-mailadres bestaat al."
+msgstr "Het e--mailadres bestaat al."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
-msgstr "Bevestiging e-mailadres"
+msgstr "E-mailadresbevestiging"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
-msgstr "Email adres, zoals \"gebruikersnaam@voorbeeld.net\""
+msgstr "E-mailadres, zoals \"gebruikersnaam@example.com\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
-msgstr "Email adressen"
+msgstr "E-mailadressen"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
-msgstr "Voer een gebruikersnaam of e-mailadres in"
+msgstr "Voer een gebruikersnaam of e-mailadres in."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
-msgstr "Voer de code in die je kreeg via je telefoon"
+msgstr "Voer de code in die u via uw telefoon hebt ontvangen."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
-msgstr "Fout bij autoriseren token"
+msgstr "Er is een fout opgetreden tijdens het autoriseren van het token"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
-msgstr "Fout bij koppelen gebruiker aan OpenID."
+msgstr ""
+"Er is een fout opgetreden tijdens het koppelen van de gebruiker aan OpenID."
 
 #: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 #: actions/finishaddopenid.php:126
 msgid "Error connecting user."
-msgstr "Fout bij koppelen gebruiker."
+msgstr "Er is een fout opgetreden bij het koppelen van de gebruiker."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
-msgstr "Fout bij toevoegen avatar"
+msgstr "Er is een fout opgetreden bij het toevoegen van de avatar"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
-msgstr "Fout bij toevoegen nieuw profiel"
+msgstr "Er is een fout opgetreden tijdens het invoegen van een nieuw profiel"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
-msgstr "Fout bij toevoegen profiel op afstand"
+msgstr ""
+"Er is een fout opgetreden tijdens het invoegen in het profiel op afstand."
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
-msgstr "Fout bij opslaan adresbevestiging."
+msgstr "Er is een fout opgetreden bij het opslaan van de adresbevestiging."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
-msgstr "Fout bij opslaan profiel op afstand"
+msgstr ""
+"Er is een fout opgetreden tijdens het opslaan van het profiel op afstand."
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
-msgstr "Fout bij opslaan van het profiel."
+msgstr "Er is een fout opgetreden bij het opslaan van het profiel."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
-msgstr "Fout bij opslaan van de gebruiker."
+msgstr "Er is een fout opgetreden bij het opslaan van de gebruiker."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Fout bij opslaan gebruiker; ongeldig."
 
@@ -884,79 +1022,92 @@ msgstr "Fout bij opslaan gebruiker; ongeldig."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
-msgstr "Fout bij instellingen gebruiker."
+msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
 
 #: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 #: actions/finishaddopenid.php:131
 msgid "Error updating profile"
-msgstr "Fout bij actualiseren profiel"
+msgstr "Er is een fout opgetreden tijdens het bijwerken van het profiel"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
-msgstr "Fout bij actualiseren profiel op afstand"
+msgstr ""
+"Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand."
 
 #: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 #: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
-msgstr "Fout bij bevestigingscode."
+msgstr "Er is een fout opgetreden die te maken heeft met de bevestigingscode."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
-msgstr "Gebruikersnaam bestaat al"
+msgstr "De gebruikersnaam bestaat al"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "Veelgestelde vragen"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
-msgstr "Actualiseren avatar niet gelukt."
+msgstr "Het bijwerken van de avatar is mislukt."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed voor vrienden van %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed voor antwoorden aan %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
-msgstr "Feed voor tag %s"
+msgstr "Feed voor label %s"
 
 #: ../lib/searchaction.php:105 lib/searchaction.php:105
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr "Vind de inhoud van een bericht"
+msgstr "Inhoud van mededelingen vinden"
 
 #: ../lib/searchaction.php:101 lib/searchaction.php:101
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
-msgstr "Vind mensen op deze site"
+msgstr "Gebruikers op deze site vinden"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Om veiligheidsredenen vragen we je je gebruikersnaam en wachtwoord nogmaals "
-"in te voeren alvorens je instellingen te veranderen."
+"Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals "
+"invoeren alvorens u uw instellingen kunt wijzigen."
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Volledige naam"
 
@@ -965,45 +1116,61 @@ msgstr "Volledige naam"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
-msgstr "Volledige naam is te lang (maximaal 255 tekens)"
+msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Help"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
-msgstr "Home"
+msgstr "Thuis"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
-msgstr "Homepage"
+msgstr "Thuispagina"
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
-msgstr "Homepage is geen geldige URL"
+msgstr "De thuispagina is geen geldige URL."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
-msgstr "Ik wil een bericht posten per email"
+msgstr "Ik wil mededelingen per e-mail versturen."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM-adres"
 
@@ -1013,86 +1180,93 @@ msgid "IM Settings"
 msgstr "IM-instellingen"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Als je al een account hebt, log dan in met je gebruikersnaam en wachtwoord "
-"om het aan je OpenID te koppelen."
+"Als u al een gebruiker hebt, meld dan aan met uw gebruikersnaam en "
+"wachtwoord om met uw OpenID te koppelen."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Als je een OpenID aan je account wilt toevoegen, vul het dan in het veld "
-"hieronder in en klik op \"Voeg toe\"."
+"Als u een OpenID aan uw gebruiker wilt toevoegen, vul het dan in het veld "
+"hieronder in en klik op \"Toevoegen\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Als je je paswoord vergeten of verloren bent, kan je hier een nieuwe "
-"aanvragen naar het mailadres dat bij ons _ _ opgeslagen is in je account."
+"Als u uw wachwoord kwijt bent, dan kunnen we u een nieuw wachtwoord sturen "
+"op het e-mailadres dat u bij uw gebruiker hebt geregistreerd."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
-msgstr "Binnenkomende mail"
+msgstr "Inkomende e-mail"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
-msgstr "Binnenkomende mailadres is verwijderd"
+msgstr "Het e-mailadres voor inkomende mail is verwijderd."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
-msgstr "Incorrect oud wachtwoord"
+msgstr "Het oude wachtwoord is onjuist"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
-msgstr "Incorrecte gebruikersnaam of wachtwoord."
+msgstr "De gebruikersnaam of wachtwoord is onjuist."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Instructies om je wachtwoord te herstellen zijn verstuurd naar het e-"
-"mailadres dat voor je account is geregistreerd."
+"De instructies om uw wachtwoord te herstellen zijn verstuurd naar het e-"
+"mailadres dat voor uw gebruiker is geregistreerd."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr "Ongeldige avatar-URL '%s'"
+msgstr "Ongeldige avatar-URL \"%s\""
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
-msgstr "Ongeldig Email adres: %s"
+msgstr "Ongeldig e-mailadres: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
-msgstr "Ongeldige homepage '%s'"
+msgstr "Ongeldige thuspagina \"%s\""
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
-msgstr "Ongeldige licentie-URL '%s'"
+msgstr "Ongeldige licentie-URL \"%s\""
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
-msgstr "Ongeldige berichtinhoud"
+msgstr "Ongeldige mededelinginhoud"
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
 #: actions/postnotice.php:72
@@ -1105,92 +1279,110 @@ msgid "Invalid notice url"
 msgstr "Ongeldige bericht-URL"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
-msgstr "Ongeldige profiel-URL '%s'."
+msgstr "Ongeldige profiel-URL \"%s\"."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
-msgstr "Ongeldige profiel-URL (foutieve syntax)"
+msgstr "Ongeldige profiel-URL (foutieve opmaak)"
 
 #: ../actions/finishremotesubscribe.php:77
 #: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
-msgstr "Ongeldige profiel-URL teruggestuurd door de server."
+msgstr "Er is een ongeldige profiel-URL teruggestuurd door de server."
 
 #: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
-msgstr "Ongeldige afmeting."
+msgstr "Ongeldige afmetingen."
 
 #: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
-msgstr "Uitnodiging(en) verzonden"
+msgstr "De uitnodiging(en) zijn verzonden"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
-msgstr "Uitnodiging(en) verzonden an de volgende mensen:"
+msgstr "Uitnodiging(en) zijn verzonden aan de volgende mensen:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Uitnodigen"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
-msgstr "Nodig nieuwe gebruikers uit"
+msgstr "Nieuwe gebruikers uitnodigen"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 ""
-"Het draait op de [StatusNet](http://status.net/) microbloggingsoftware versie "
-"%s, beschikbaar onder de [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"De site werkt met de [StatusNet](http://status.net/) microblogsoftware, "
+"versie %s, beschikbaar onder de [GNU Affero General Public License](http://"
+"www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
-msgstr "Jabber-ID al in gebruik bij een andere gebruiker"
+msgstr "Het Jabber-ID wordt al gebruikt door een andere gebruiker."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, 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 of GTalk adres, zoals \"JouwNaam@example.org\". Zorg ervoor dat je "
-"eerst % aan je contactenlijst in je IM-programma of in GTalk toevoegt."
+"Jabber-ID of GTalk-adres, zoals \"gebruiker@example.org\". Zorg ervoor dat u "
+"%s eerst aan uw contactenlijst in uw IM-programma of in GTalk toevoegt."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Taal"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
-msgstr "Taal is te lang (max 50 karaketers)"
+msgstr "Taal is te lang (max 50 tekens)."
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 #: actions/profilesettings.php:85 actions/register.php:187
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Locatie"
 
@@ -1199,7 +1391,12 @@ msgstr "Locatie"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Locatie is te lang (maximaal 255 tekens)."
 
@@ -1208,115 +1405,134 @@ msgstr "Locatie is te lang (maximaal 255 tekens)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
-msgstr "Inloggen"
+msgstr "Aanmelden"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Log in met een [OpenID](%%doc.openid%%) account."
+msgstr "Aanmelden met een [OpenID-gebruiker](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
 "(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
 "%). "
 msgstr ""
-"Log in met je gebruikersnaam en wachtwoord. Heb je nog geen gebruikersnaam? "
-"[Registreer](%%action.register%%) dan een nieuw account, of probeer [OpenID]"
-"(%%action.openidlogin%%)."
+"Meld u aan met uw gebruikersnaam en wachtwoord. Hebt u nog geen "
+"gebruikersnaam? [Registreer](%%action.register%%) dan een nieuw gebruiker, "
+"of probeer [OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
-msgstr "Uitloggen"
+msgstr "Afmelden"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
-msgstr "Langere naam, mogelijk je \"eigen\" naam"
+msgstr "Een langere naam, mogelijk uw echte naam"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Wachtwoord kwijt of vergeten?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
-msgstr "Maak een nieuw emailadres aan voor te posten naar; verwijder de oude."
+msgstr ""
+"Een nieuw e-mailadres instellen voor het onvangen van e-mail; verwijdert het "
+"eerder geinstelde e-mailadres."
 
 #: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
-msgstr "Geef hier aan hoe je de notificaties wilt van %%site.name%%."
+msgstr "E-mail ontvangen  van %%site.name%% beheren."
 
-#  String should contain a variable token for since 'when'
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Lid sinds"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog van %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, 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 ""
-"Je provider van je mobiel. Als je weet welke provider je SMS over MAIL kan "
-"verzorgen en niet in de lijst staat kan je een verzoek bij ons doen, liefst "
-"met de gegevens erbij.  laat ons per mail iets weten %s."
+"De provider van uw mobiele telefoon. Als u een provider kent die e-mail via "
+"SMS ondersteunt, maar nog niet in de lijst is opgenomen, laat dit ons dan "
+"via e-mail weten op het e-mailadres %s."
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
-msgstr "Mijn tekst en bestanden zijn beschikbaar onder_"
+msgstr "Mijn teksten en bestanden zijn beschikbaar onder "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Nieuw"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
-msgstr "Nieuw email adres om te posten aan %s"
+msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
-msgstr "Nieuw binnenkomende emailadres is toegevoegd"
+msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Nieuwe gebruikersnaam"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Nieuw bericht"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
-msgstr "Nieuw wachtwoord is opgeslagen. Je bent nu ingelogd."
+msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151 actions/login.php:101
@@ -1324,7 +1540,13 @@ msgstr "Nieuw wachtwoord is opgeslagen. Je bent nu ingelogd."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Gebruikersnaam"
 
@@ -1333,60 +1555,77 @@ msgstr "Gebruikersnaam"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
-msgstr "Gebruikersnaam al in gebruik. Probeer een andere."
+msgstr ""
+"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
 #: ../actions/register.php:67 ../actions/updateprofile.php:77
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Gebruikersnaam moet bestaan uit alleen kleine letters en cijfers en geen "
-"spaties."
+"De gebruikersnaam moet alleen bestaan uit kleine letters en cijfers, en mag "
+"geen spaties bevatten."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
-msgstr "Gebruikersnaam niet toegestaan."
+msgstr "De opgegeven gebruikersnaam is niet toegestaan."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
-msgstr "Gebruikersnaam van de gebruiker die je wilt volgen"
+msgstr "De gebruikersnaam van de gebruiker die u wilt volgen"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
-msgstr "Gebruikersnaam of e-mail"
+msgstr "Gebruikersnaam of e-mailadres"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "Nee"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Geen Jabber-ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
-msgstr "Geen autorisatie verzoek!"
+msgstr "Geen autorisatieverzoek!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
-msgstr "Geen provider geselecteerd"
+msgstr "Er is geen provider geselecteerd."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
-msgstr "Geen code ingevuld"
+msgstr "Er is geen code ingevoerd"
 
 #: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
@@ -1396,30 +1635,37 @@ msgstr "Geen bevestigingscode."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Geen inhoud!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
-msgstr "Geen emailadres"
+msgstr "Geen e-mailadres"
 
 #: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
 msgstr "Geen ID."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
-msgstr "Geen binnenkomende emailadres"
+msgstr "Geen binnenkomend e-mailadres"
 
 #: ../actions/finishremotesubscribe.php:65
 #: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
 msgid "No nickname provided by remote server."
-msgstr "Geen gebruikersnaam verschaft door de server op afstand."
+msgstr "De server aan de andere kant heeft geen gebruikersnaam opgegeven."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Geen gebruikersnaam."
 
@@ -1427,24 +1673,27 @@ msgstr "Geen gebruikersnaam."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
-msgstr "Geen bevestiging in behandeling om te annuleren."
+msgstr "Er is geen openstaand bevestigingsverzoek om te annuleren."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
-msgstr "Geen telefoonnummer"
+msgstr "Geen telefoonnummer."
 
 #: ../actions/finishremotesubscribe.php:72
 #: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
 msgid "No profile URL returned by server."
-msgstr "Geen profiel-URL teruggestuurd door de server."
+msgstr "Er is geen profiel-URL teruggestuurd door de server."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
-msgstr "Geen geregistreerd e-mailadres voor die gebruiker."
+msgstr "Die gebruiker heeft geen e-mailadres geregistreerd."
 
 #: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 #: actions/userauthorization.php:57
@@ -1454,7 +1703,7 @@ msgstr "Geen verzoek gevonden!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Geen resultaten"
 
@@ -1465,30 +1714,36 @@ msgstr "Geen afmeting."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
-msgstr "Geen status gevonden met dit ID"
+msgstr "Er is geen status gevonden met dit ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
-msgstr "Geen status gevonden met dat ID"
+msgstr "Er is geen status gevonden met dit ID."
 
 #: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 #: actions/openidsettings.php:222
 msgid "No such OpenID."
-msgstr "Die OpenID is niet bekend."
+msgstr "Het opgegeven OpenID bestaat niet."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Onbekend document."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
-msgstr "Onbekend bericht."
+msgstr "De mededeling bestaat niet."
 
 #: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 #: actions/recoverpassword.php:62
@@ -1524,18 +1779,30 @@ msgstr "Onbekend abonnement"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Onbekende gebruiker."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
-msgstr "Geen gebruiker met dit emailadres of gebruikersnaam"
+msgstr ""
+"Er bestaat geen gebruiker met het opgegeven e-mailadres of de opgegeven "
+"gebruikersnaam."
 
 #: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
-msgstr "Niemand te tonen!"
+msgstr "Geen weer te geven gebruikers!"
 
 #: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 #: actions/recoverpassword.php:66
@@ -1543,32 +1810,38 @@ msgid "Not a recovery code."
 msgstr "Geen geldige herstelcode."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Geen geregistreerde gebruiker"
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
-msgstr "Geen juiste ingevulde gegevens"
+msgstr "Geen ondersteund gegevensformaat."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Geen geldige Jabber-ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Geen geldige OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Geen geldig e-mailadres."
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Geen geldig e-mailadres."
 
@@ -1576,6 +1849,11 @@ msgstr "Geen geldig e-mailadres."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Geen geldige gebruikersnaam."
 
@@ -1592,12 +1870,13 @@ msgstr "Geen geldige profiel-URL (geen XRDS gedefinieerd)."
 #: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 #: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Geen geldige profiel-URL (geen YADIS document)."
+msgstr "Geen geldige profiel-URL (geen YADIS-document)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
-msgstr "Geen afbeelding of beschadigd bestand."
+msgstr "Het bestand is geen afbeelding of het bestand is beschadigd."
 
 #: ../actions/finishremotesubscribe.php:51
 #: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
@@ -1606,11 +1885,13 @@ msgstr "Niet geautoriseerd."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Onverwacht antwoord!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Niet gevonden"
 
@@ -1626,60 +1907,69 @@ msgstr "Niet gevonden"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
-msgstr "Niet ingelogd."
+msgstr "Niet aangemeld."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Niet geabonneerd!"
 
 #: ../actions/opensearch.php:35 actions/opensearch.php:35
 #: actions/opensearch.php:67
 msgid "Notice Search"
-msgstr "Bericht zoeken"
+msgstr "Mededeling zoeken"
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
 #: actions/showstream.php:180 actions/showstream.php:187
 #: actions/showstream.php:192
 #, php-format
 msgid "Notice feed for %s"
-msgstr "Berichten-feed voor %s"
+msgstr "Mededelingenfeed voor %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
-msgstr "Bericht heeft geen profiel"
+msgstr "Mededeling heeft geen profiel"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
-msgstr "Berichten"
+msgstr "Mededelingen"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
-msgstr "Berichten tagged met %s"
+msgstr "Mededelingen met het label %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Oud wachtwoord"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
-msgstr "OpenID-account instellen"
+msgstr "OpenID-gebruiker instellen"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "OpenID automatisch verzenden"
 
@@ -1687,29 +1977,34 @@ msgstr "OpenID automatisch verzenden"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
-msgstr "Log in met OpenID"
+msgstr "Aanmelden met OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID-URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
-msgstr "OpenID-authenticatie geannuleerd."
+msgstr "De OpenID-authenticatie is geannuleerd."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID-authenticatie niet gelukt: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID-fout: %s"
@@ -1725,13 +2020,14 @@ msgid "OpenID settings"
 msgstr "OpenID-instellingen."
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
-msgstr "Eventueel een persoonlijke boodschap aan de uitnodiging"
+msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
-msgstr "Gedeeltelijke uploaden."
+msgstr "Gedeeltelijke upload."
 
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
 #: ../actions/register.php:153 ../lib/settingsaction.php:93
@@ -1739,41 +2035,53 @@ msgstr "Gedeeltelijke uploaden."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Wachtwoord"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
-msgstr "Wachtwoord en bevestiging komen niet overeen."
+msgstr "Het wachtwoord en de bevestiging komen niet overeen."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
-msgstr "Wachtwoord moet uit 6 of meer tekens bestaan."
+msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Wachtwoordherstel aangevraagd"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
-msgstr "Wachtwoord opgeslagen."
+msgstr "Het wachtwoord is opgeslagen."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
-msgstr "Wachtwoorden komen niet overeen."
+msgstr "De wachtwoorden komen niet overeen."
 
 #: ../lib/searchaction.php:100 lib/searchaction.php:100
 #: lib/searchgroupnav.php:80
 msgid "People"
-msgstr "Mensen"
+msgstr "Gebruikers"
 
 #: ../actions/opensearch.php:33 actions/opensearch.php:33
 #: actions/opensearch.php:64
@@ -1783,19 +2091,22 @@ msgstr "Mensen zoeken"
 #: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 #: actions/peoplesearch.php:58
 msgid "People search"
-msgstr "Mensen zoeken"
+msgstr "Gebruikers zoeken"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Persoonlijk"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Persoonlijk bericht"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Telefoonnummer, geen spaties of leestekens, met netnummer"
+msgstr "Telefoonnummer zonder spaties of leestekens, met netnummer"
 
 #: ../actions/userauthorization.php:78
 msgid ""
@@ -1803,22 +2114,24 @@ msgid ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Ga alsjeblieft deze details na om er zeker van te zijn dat je je wilt "
-"abonneren op de berichten van deze gebruiker. Als je niet zojuist hebt "
-"aangegeven je op iemand's berichten te willen abonneren, klik dan op "
-"\"Annuleer\"."
+"Controleer alstublieft deze details om vast te stellen dat u zich wilt "
+"abonneren of de mededelingen van deze gebruiker. Als u niet hebt verzocht te "
+"abonneren op de mededelingen van een andere gebruiker, klik dan op "
+"\"Annuleren\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Plaats een bericht als mijn Jabber/GTalk-status verandert."
+msgstr "Mededeling versturen als mijn Jabber/GTalk-status wijzigt."
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
 #: ../actions/smssettings.php:94 actions/emailsettings.php:86
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Voorkeuren"
 
@@ -1827,42 +2140,52 @@ msgstr "Voorkeuren"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
-msgstr "Voorkeuren opgeslagen."
+msgstr "De voorkeuren zijn opgeslagen."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
-msgstr "Taal voorkeur"
+msgstr "Voorkeurstaal"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Privacy"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
-msgstr "Probleem bij opslaan bericht."
+msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profiel"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "Profiel-URL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profielinstellingen"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Profiel onbekend"
 
@@ -1871,32 +2194,36 @@ msgid "Public Stream Feed"
 msgstr "Openbare feed"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Openbare tijdlijn"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publiceer een MicroID voor mijn Jabber / GTalk adres"
+msgstr "Een MicroID voor mijn Jabber/GTalk-adres publiceren."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
-msgstr "Publiceer een MicroID voor mijn email adres"
+msgstr "Een MicroID voor mijn e-mailadres publiceren."
 
 #: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
 msgid "Recent Tags"
-msgstr "Recent Tags"
+msgstr "Recente labels"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Herstellen"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Wachtwoord herstellen"
 
@@ -1909,37 +2236,45 @@ msgstr "Herstelcode voor onbekende gebruiker."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
-msgstr "Registreer"
+msgstr "Registreren"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
-msgstr "Registratie niet toegestaan"
+msgstr "Registratie is niet toegestaan."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
-msgstr "Registratie gelukt"
+msgstr "De registratie is voltooid"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Afwijzen"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
-msgstr "Onthoud mij"
+msgstr "Aanmeldgegevens onthouden"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Profiel op afstand zonder overeenkomend profiel"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Abonneren op afstand"
 
@@ -1953,72 +2288,83 @@ msgstr "Abonneren op afstand"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Verwijderen"
 
 #: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 #: actions/openidsettings.php:123
 msgid "Remove OpenID"
-msgstr "Verwijder OpenID"
+msgstr "OpenID verwijderen"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Verwijderen van je enige OpenID zou het onmogelijk maken in te loggen! Als "
-"je het moet verwijderen, voeg dan eerst een ander OpenID toe."
+"Als u uw enige OpenID verwijdert kunt u niet langer aanmelden. Als u het "
+"wilt verwijderen, voeg dan eerst een andere OpenID toe."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Antwoorden"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Antwoorden aan %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Herstellen"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Wachtwoord herstellen"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
-msgstr "SMS telefoonnummer"
+msgstr "SMS-telefoonnummer"
 
 #: ../actions/smssettings.php:33 actions/smssettings.php:33
 #: actions/smssettings.php:58
 msgid "SMS Settings"
-msgstr "SMS instellingen"
+msgstr "SMS-instellingen"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
-msgstr "SMS bevestiging"
+msgstr "SMS-bevestiging"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
-msgstr "Gelijk aan wachtwoord hierboven"
+msgstr "Gelijk aan het wachtwoord hierboven"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
-msgstr "Gelijk aan wachtwoord hierboven. verplicht"
+msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
 
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
@@ -2029,98 +2375,115 @@ msgstr "Gelijk aan wachtwoord hierboven. verplicht"
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Opslaan"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Zoeken"
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 #: actions/noticesearch.php:127
 msgid "Search Stream Feed"
-msgstr "Doorzoek feed"
+msgstr "Feed doorzoeken"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 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 ""
-"Zoek naar berichten op %%site.name%% op basis van hun inhoud. Scheid "
-"zoektermen met spaties; ze moeten uit 3 of meer tekens bestaan."
+"Zoek naar mededelingen op %%site.name%% op basis van inhoud. Scheid "
+"zoektermen met spaties. Zoektermen moeten uit drie of meer tekens bestaan."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 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 ""
-"Zoek naar mensen op %%site.name%% op basis van hun naam, locatie of "
-"interesses. Scheid de zoektermen met spaties; ze moeten uit 3 of meer tekens "
-"bestaan."
+"Zoeken naar gebruikers op %%site.name%% op basis van hun naam, locatie of "
+"interesses. Scheid de zoektermen met spaties. Zoektermen moeten uit drie of "
+"meer tekens bestaan."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Selecteer een provider"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
-msgstr "Verstuur"
+msgstr "Verzenden"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
-msgstr "Stuur mij een bericht van nieuwe abonnees via een email"
+msgstr "Mij e-mailen bij nieuwe abonnementen."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Stuur mij berichten via Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
-"Stuur me aankondigingen via sms, maar ik begrijp dat ik kosten van mijn "
-"provider kan hebben."
+"Stuur me mededelingen via SMS. Ik begrijp dat dit exorbitante rekeningen van "
+"mijn provider kan opleveren."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Stuur me antwoorden via Jabber / GTalk van mensen op wie ik niet geabonneerd "
-"ben."
+"Stuur me antwoorden via Jabber/GTalk van gebruiker op wie ik niet "
+"geabonneerd ben."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Instellingen"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
-msgstr "Instellingen opgeslagen."
+msgstr "De instellingen zijn opgeslagen."
 
 #: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
-msgstr "De meest populaire tags van de afgelopen week"
+msgstr "De meest populaire labels van de afgelopen week"
 
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 #: actions/finishaddopenid.php:114
 msgid "Someone else already has this OpenID."
-msgstr "Iemand anders heeft die OpenID al."
+msgstr "Deze OpenID wordt al door een andere gebruiker gebruikt."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
 #: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
@@ -2129,88 +2492,104 @@ msgid "Something weird happened."
 msgstr "Er is iets eigenaardigs gebeurd."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
-msgstr "Sorry, inkomende mail is niet toegestaan"
+msgstr "Inkomende e-mail is niet toegestaan."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
-msgstr "Sorry, dit adres is niet een juist mailadres van je."
+msgstr "Dit is niet uw inkomende e-mailadres."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Bron"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Statistieken"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
-msgstr "Opgeslagen OpenID niet gevonden."
+msgstr "Het opgeslagen OpenID is niet gevonden."
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Abonneren"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abonnees"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
-msgstr "Abonnement geautoriseerd"
+msgstr "Het abonnement is geautoriseerd"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
-msgstr "Abonnement afgewezen"
+msgstr "Het abonnement is afgewezen"
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abonnementen"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
-msgstr "Systeemfout bij uploaden bestand."
+msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
-msgstr "Tags"
+msgstr "Labels"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Tekst"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Tekst doorzoeken"
 
 #: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 #: actions/openidsettings.php:227
 msgid "That OpenID does not belong to you."
-msgstr "Die OpenID is niet van jou."
+msgstr "Dit is niet uw OpenID."
 
 #: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 #: actions/confirmaddress.php:94
@@ -2220,11 +2599,12 @@ msgstr "Dit adres is al bevestigd."
 #: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 #: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
-msgstr "Die bevestigingscode is niet voor jou!"
+msgstr "Dit is niet uw bevestigingscode!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
-msgstr "Dit Emailadres is al geregistreerd door iemand anders"
+msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
 
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
 #: lib/imagefile.php:71
@@ -2232,201 +2612,238 @@ msgid "That file is too big."
 msgstr "Dat bestand is te groot."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
-msgstr "Dat is al je Jabber-ID."
+msgstr "U hebt dit al ingesteld als uw Jabber-ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
-msgstr "Dit is al je mailadres."
+msgstr "U hebt dit al ingesteld als uw e-mailadres."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
-msgstr "Dit is al je telefoonnummer"
+msgstr "U hebt dit al ingesteld als uw telefoonnummer."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
-msgstr "Dat is niet je Jabber-ID."
+msgstr "Dit is niet uw Jabber-ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
-msgstr "Dit is niet je emailadres"
+msgstr "Dit is niet uw e-mailadres."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
-msgstr "Dit is niet je telefoonnummer"
+msgstr "Dit is niet uw telefoonnummer."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Dat is het verkeerde IM-adres."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
-msgstr "Dit is het verkeerde bevestigings code/nummer"
+msgstr "Dit is het verkeerde bevestigingsnummer."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
-msgstr "Dit telefoonnummer is al in gebruik door iemand"
+msgstr "Dit telefoonnummer is al in gebruik bij een andere gebruiker."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
-msgstr "Dat is te lang. Maximale bericht lengte is 140 tekens."
+msgstr "Dat is te lang. De maximale lengte voor mededelingen is 140 tekens."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
-msgstr "Dat is te lang. Maximale bericht lengte is 255 tekens."
+msgstr "Dat is te lang. De maximale lengte voor mededelingen is 255 tekens."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Het adres \"%s\" is voor je account bevestigd."
+msgstr "Het adres \"%s\" is voor uw gebruiker bevestigd."
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
-msgstr "Het adres was verwijderd."
+msgstr "Het adres is verwijderd."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 ""
 "Het abonnement is geautoriseerd maar er is geen callback-URL doorgegeven. "
-"Loop de instructies van de site na voor details over hoe het abonnement te "
-"autoriseren. Je abonnement-token is:"
+"Controleer de instructies van de website voor details over hoe het "
+"abonnement te autoriseren."
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 ""
-"Het abonnement is afgewezen maar er is geen callback-URL doorgegeven. Loop "
-"de instructies van de site na voor details over hoe het abonnement volledig "
-"af te wijzen."
+"Het abonnement is afgewezen maar er is geen callback-URL doorgegeven. "
+"Controleer de instructies van de website voor details over hoe het "
+"abonnement volledig af te wijzen."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr "Dit zijn de mensen die %s's berichten volgen."
+msgstr "Dit zijn de gebruikers die de mededelingen van %s volgen."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
-msgstr "Dit zijn de mensen die jouw berichten volgen."
+msgstr "Dit zijn de gebruikers die uw mededelingen volgen."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
-msgstr "Dit zijn de mensen van wie %s de berichten volgt."
+msgstr "Dit zijn de gebruikers waarvan %s de mededelingen volgt."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
-msgstr "Dit zijn de mensen van wie jij de berichten volgt."
+msgstr "Dit zijn de gebruikers van wie u de mededelingen volgt."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"Deze mensen zijn al geregistreerd en jij kan je automatisch bij hun "
-"abonneren: "
+"Deze gebruikers zijn al geregistreerd en u kunt zich automatisch bij hun "
+"abonneren:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
-msgstr "Deze bevestigingscode is te oud. Begin alsjeblieft opnieuw."
+msgstr "Deze bevestigingscode is te oud. Begin alstublieft opnieuw."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Dit formulier zou zichzelf automatisch moeten versturen. Zoniet, klik dan op "
-"de verstuurknop om naar je OpenID-provider te gaan."
+"Dit formulier zou zichzelf automatisch moeten versturen. Als dat niet "
+"gebeurt, klik dan op \"Opslaan\" om naar uw OpenID-provider te gaan."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"Dit is de eerste keer dat je bij %s ingelogd bent dus moeten we je OpenID "
-"koppelen aan een lokaal account. Je kunt ofwel een nieuw account aanmaken, "
-"ofwel koppelen aan je bestaande account, als je er al een hebt."
+"Dit is de eerste keer dat u hebt aangemeld bij %s. U moet nu uw OpenID "
+"koppelen aan een lokale gebruiker. U kunt een nieuwe gebruiker aanmaken of "
+"verbinden via uw bestaande gebruiker, als u die hebt."
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
-msgstr "Dit vraagt om te posten of te verwijderen"
+msgstr "Deze methode heeft een POST of DELETE nodig."
 
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
 #: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
-msgstr "Je moet hier dus posten"
+msgstr "Deze methode heeft een POST nodig."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
-msgstr "Deze pagina is niet beschikbaar in een mediatype dat jij accepteert"
+msgstr "Deze pagina is niet beschikbaar in een mediatype dat u accepteert"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Tijdzone"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
-msgstr "Tijdzone niet geselecteerd"
+msgstr "Er is geen tijdzone geselecteerd."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: 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 ""
-"Om je te abonneren kun je [inloggen](%%action.login%%), of een nieuw account "
-"[registreren](%%action.register%%). Als je al een account op een "
-"[compatibele microblogging-site](%%doc.openmublog%%) hebt, voer dan "
-"hieronder je profiel-URL in."
+"Om u te abonneren kunt u [aanmelden](%%action.login%%), of een nieuw "
+"gebruiker [registreren](%%action.register%%). Als u al een gebruiker bij een "
+"[compatibele microblogsite](%%doc.openmublog%%) hebt, voer dan hieronder uw "
+"profiel-URL in."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
-msgstr "Twee gebruikers ID of namen moeten worden gegeven"
+msgstr "Er moeten twee gebruikersnamen opgegeven worden."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL van je homepage, blog, of profiel op een andere site"
+msgstr "De URL van uw thuispagina, blog of profiel bij een andere website"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL van je profiel op een andere, compatibele microbloggingdienst"
+msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst"
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
@@ -2436,17 +2853,24 @@ msgstr "URL van je profiel op een andere, compatibele microbloggingdienst"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
-msgstr "Formulier onverwacht ingezonden."
+msgstr "Het formulier is onverwacht ingezonden."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
-msgstr "Wachtwoord onverwacht teruggesteld."
+msgstr "Het wachtwoord is onverwacht opnieuw ingesteld."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
-msgstr "Onbekende aktie"
+msgstr "Onbekende handeling"
 
 #: ../actions/finishremotesubscribe.php:58
 #: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
@@ -2465,7 +2889,7 @@ msgstr ""
 #: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
-msgstr "Onherkenbaar adrestype %s"
+msgstr "Onbekend adrestype %s"
 
 #: ../actions/showstream.php:209 actions/showstream.php:219
 #: lib/unsubscribeform.php:137
@@ -2475,38 +2899,47 @@ msgstr "Abonnement opheffen"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Niet ondersteunde OMB-versie"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Niet ondersteund beeldbestandsformaat."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
-msgstr "Bijwerkingen door SMS"
+msgstr "Updates via SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
-msgstr "Bijwerkingen door de messenger (IM)"
+msgstr "Updates via instant messenger (IM)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Bijwerkingen van %1$s en vrienden op %2$s!"
+msgstr "Updates van %1$s en vrienden op %2$s."
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
-msgstr "Bijwerkingen van %1$s op %2$s!"
+msgstr "Updates van %1$s op %2$s."
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Uploaden"
 
@@ -2517,24 +2950,27 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Hier kun je een nieuwe \"avatar\" (gebruikersafbeelding) uploaden. Je kunt "
+"Hier kunt u een nieuwe \"avatar\" (gebruikersafbeelding) uploaden. U kunt "
 "het plaatje achteraf niet bewerken, dus zorg ervoor dat het min of meer "
-"vierkant is. Het moet ook onder site licentie vallen. Gebruik een afbeelding "
-"die je eigendom is en die je wilt delen."
+"vierkant is. Het moet ook onder de sitelicentie vallen. Gebruik een "
+"afbeelding die uw eigendom is en die u wilt delen."
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
-msgstr "Upload een nieuwe profielfoto"
+msgstr "Nieuwe profielafbeelding uploaden"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Gebruik deze pagina om je vrienden en collega´s uit te nodigen voor deze "
-"site"
+"Gebruik deze pagina om uw vrienden en collega´s uit te nodigen deze dienst "
+"te gebruiken."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
 
@@ -2558,11 +2994,16 @@ msgstr "Gebruiker waarnaar geluisterd wordt bestaat niet."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
-msgstr "Gebruiker heeft geen profiel."
+msgstr "Deze gebruiker heeft geen profiel."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Gebruikersnaam"
 
@@ -2571,124 +3012,134 @@ msgid "User not found."
 msgstr "Gebruiker niet gevonden"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
-msgstr "Welke tijdzone heb je normaal?"
+msgstr "In welke tijdzone verblijft u meestal?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
-msgstr "Hoe staat het ermee, %s?"
+msgstr "Hallo, %s."
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Waar je bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
+msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
-msgstr "Foutief beeldbestandstype voor '%s'"
+msgstr "Het beelbestandstype voor \"'%s\" is onjuist"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
-msgstr "Verkeerde afmeting van afbeelding bij '%s'"
+msgstr "De afbeelding bij \"%s\" heeft verkeerde afmetingen"
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Ja"
 
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 #: actions/finishaddopenid.php:112
 msgid "You already have this OpenID!"
-msgstr "Je hebt die OpenID al!"
+msgstr "U hebt dit OpenID al gekoppeld."
 
 #: ../actions/deletenotice.php:37 actions/deletenotice.php:37
 msgid ""
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
 msgstr ""
-"Je staat op het punt een bericht definitief te verwijderen._ _ Als dit "
-"gebeurd kan het nooit meer teruggevonden worden."
+"U staat op het punt een mededeling definitief te verwijderen. Deze handeling "
+"kan niet ongedaan gemaakt worden."
 
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
-msgstr "Je bent al aangemeld!"
+msgstr "U bent al aangemeld!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
-msgstr "Je bent bij deze abonnees al aangemeld:"
+msgstr "U bent als geabonneerd op deze gebruikers:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
-msgstr "Je bent niet verbonden met deze gebruiker"
+msgstr "U bent niet bevriend met de aangegeven gebruiker."
 
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
-msgstr "Hier kun je je wachtwoord wijzigen. Kies een goede!"
+msgstr "Hier kunt u uw wachtwoord wijzigen. Kies een sterk wachtwoord!"
 
 #: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
-msgstr "Je kunt een nieuw account aanmaken om berichten te gaan plaatsen."
+msgstr "Als u een gebruiker registreet, kunt u mededelingen gaan versturen."
 
 #: ../actions/smssettings.php:28 actions/smssettings.php:28
 #: actions/smssettings.php:69
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Je kunt een SMS ontvangen via mail van %%site.name%%."
+msgstr "U kunt SMS-berichten per e-mail ontvangen van %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Je kunt een OpenID van je account verwijderen door op de knop \"Verwijder\" "
-"te klikken."
+"Verwijderen een OpenID van uw gebruiker door de klikken op \"Verwijderen\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, fuzzy, php-format
+#: actions/imsettings.php:70
+#, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"Je kunt berichten verzenden en ontvangen via Jabber/GTalk [instant messages]"
-"(%%doc.im%%). Configureer je adres en instellingen hieronder."
+"U kunt berichten verzenden en ontvangen via Jabber/GTalk [\"instant messages"
+"\"](%%doc.im%%). Maak hieronder uw instellingen."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
-"Je kunt hier je persoonlijke profielinformatie bijwerken zodat mensen meer "
-"over je weten."
+"Hier kunt u uw persoonlijke profiel bijwerken met informatie over uzelf voor "
+"andere gebruikers."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
-msgstr "Je kunt het lokale abonnement gebruiken!"
+msgstr "U kunt het lokale abonnement gebruiken!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
-msgstr "Je kunt niet registreren als je niet met de licentie akkoord gaat."
+msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
-msgstr "Je hebt dat profiel niet ingezonden"
+msgstr "U hebt dat profiel niet ingezonden"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2700,105 +3151,119 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
-"Je hebt een nieuw postadres op %1$s.\n"
+"U hebt een nieuw postadres op %1$s.\n"
 "\n"
-"Zend een email naar %2$s om een nieuwe post te zetten.\n"
+"Zend een e-mail naar %2$s om nieuwe berichten te versturen.\n"
 "\n"
-"Meer mail instructies vind je op %3$s.\n"
+"Meer informatie over e-mailen vindt u op %3$s.\n"
 "\n"
 "Met vriendelijke groet,\n"
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
-msgstr "Je mag geen status van een ander wissen"
+msgstr "U kunt de status van een andere gebruiker niet verwijderen."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
-"Je moet ingelogd zijn om andere te uit te nodigen om gebruik te maken van %s"
+"U moet aangemeld zijn om anderen te kunnen uitnodigen gebruik te maken van %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
-"U wordt verwittigd wanneer uw genodigden aanvaarden de uitnodiging en te "
-"registreren op de site. Bedankt voor de verspreiding en groei van de "
+"U wordt op de hoogte gesteld wanneer uw genodigden de uitnodiging accepteren "
+"en zich bij de site registreren. Dank u wel voor het laten groeien van de "
 "gemeenschap!"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
-msgstr "Je bent geïdentificeerd. Vul hieronder een nieuw wachtwoord in."
+msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in. "
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
-msgstr "Je OpenID-URL"
+msgstr "Uw OpenID-URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
-msgstr "Je gebruikersnaam op deze server, of je geregistreerde e-mailadres."
+msgstr "Uw gebruikersnaam op deze server, of uw geregistreerde e-mailadres."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"Met [OpenID](%%doc.openid%%) kun je op vele sites inloggen met hetzelfde "
-"gebruikersaccount. Hier kun je de aan je account gekoppelde OpenID's beheren."
+"Met [OpenID](%%doc.openid%%) kunu op heel veel websites aanmelden met "
+"dezelfde gebruiker. U kunt hier uw gekoppelde OpenID's beheren."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "een paar seconden geleden"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "ongeveer %d dagen geleden"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "ongeveer %d uur geleden"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "ongeveer %d minuten geleden"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "ongeveer %d maanden geleden"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "ongeveer een dag geleden"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "ongeveer een minuut geleden"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "ongeveer een maand geleden"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "ongeveer een uur geleden"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
 #: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
-msgstr "Verwijderen"
+msgstr "verwijderen"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
 #: ../lib/stream.php:117 actions/noticesearch.php:136
@@ -2813,14 +3278,16 @@ msgid "reply"
 msgstr "antwoord"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "gelijk aan wachtwoord hierboven"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
-msgstr "Dit filetype is niet toegestaan"
+msgstr "Dit bestandstype wordt niet ondersteund"
 
 #: ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
@@ -2839,68 +3306,100 @@ msgstr "« Later"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
-msgstr "Er is een problem ontstaan met je sessie, Porbeer nog eens aub."
+msgstr ""
+"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
+"alstublieft."
 
 #: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
-msgstr "Dit bericht is geen favoriet"
+msgstr "Deze mededeling staats niet op uw favorietenlijst."
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
-msgstr "Kan deze favoriet niet verwijderen"
+msgstr ""
+"Het was niet mogelijk dit bericht van uw favorietenlijst te verwijderen."
 
 #: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
-msgstr "Favoriet"
+msgstr "Aan favorieten toevoegen"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Stuur mij een Email als iemand mij als favoriet aanduid"
+msgstr "Mij een e-mail sturen als iemand mijn mededeling als favoriet instelt."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
-msgstr "Stuur mij een Email als iemand mij een privebericht toezend"
+msgstr "Mij een e-mail sturen als iemand mij een privébericht zendt."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
-msgstr "Dit bericht is al een favoriet"
+msgstr "Deze mededeling staat al in uw favorietenlijst."
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
-msgstr "Kan geen favoriet aanmaken"
+msgstr "Het was niet mogelijk een favoriet aan te maken."
 
 #: actions/favor.php:70
 msgid "Disfavor"
-msgstr "Niet favoriet"
+msgstr "Uit favorieten verwijderen"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
-msgstr "%s favorite berichten"
+msgstr "Favoriete mededelingen van %s"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
-msgstr "Feed voor favorieten berichten van %s"
+msgstr "Feed met favoriete mededelingen van %s"
 
 #: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
-msgstr "Inbox van %s - pagina %d"
+msgstr "Postvak IN van %s - pagina %d"
 
 #: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
-msgstr "Inbox van %s"
+msgstr "Postvak IN van %s"
 
 #: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Dit is jouw inbox, waar je inkomende priveberichten staan"
+msgstr "Dit is uw Postvak IN dat uw inkomende privéberichten bevat."
 
 #: actions/invite.php:178 actions/invite.php:213
 #, php-format
@@ -2908,65 +3407,76 @@ msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
 msgstr ""
-"%1$s heeft je uitgenodigd om hem te volgen op %2$s (%3$s).\n"
+"%1$s heeft u uitgenodigd om hem te volgen op %2$s (%3$s).\n"
 "\n"
 
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
 msgid "Automatically login in the future; "
-msgstr "Automatisch in de toekomst inloggen;_"
+msgstr "In het vervolg automatisch aanmelden. "
 
 #: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
-msgstr "Voor veiligheidsredenen herhaal hier je_"
+msgstr "Herhaal hier om veiligheidsredenen uw "
 
 #: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
-msgstr "Log in met je gebruikersnaam en paswoord._"
+msgstr "Meld u aan met uw gebruikersnaam en wachtwoord. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
-msgstr "Dit is te lang. max. 140 karakters invoeren."
+msgstr "Dit is te lang. De maximale lengte is 140 tekens."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
-msgstr "Geen begunstigde aangeduid"
+msgstr "Er is geen ontvanger aangegeven."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
-msgstr "Je kunt geen bericht naar deze gebruiker zenden"
+msgstr "U kunt geen bericht naar deze gebruiker zenden."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Stuur geen berichten naar jezelf, spreek gewoon zachtjes tegen jezelf."
+msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
-msgstr "Geen gebruiker gevonden zoals je zoekt"
+msgstr "De opgegeven gebruiker bestaat niet"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nieuw bericht"
 
 #: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
-msgstr "Bericht zonder bekend profiel"
+msgstr "Mededeling zonder bekend profiel"
 
 #: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) laat je toe om in meerdere sites in te loggen_"
+msgstr "Met [OpenID](%%doc.openid%%) kunt u aanmelden bij heel veel websites "
 
 #: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
-msgstr "wil je een OpenID toevoegen op je account hier_"
+msgstr "Als u een OpenID wilt toevoegen aan uw gebruiker, "
 
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
@@ -3005,6 +3515,11 @@ msgstr ""
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr ""
 
@@ -3033,6 +3548,8 @@ msgid "New password successfully saved. "
 msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3053,12 +3570,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -3066,7 +3586,7 @@ msgstr ""
 msgid "No such message."
 msgstr ""
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
@@ -3090,51 +3610,70 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
@@ -3153,14 +3692,17 @@ msgid ""
 msgstr ""
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr ""
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr ""
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -3169,6 +3711,7 @@ msgid "Twitter Username"
 msgstr ""
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr ""
 
@@ -3177,24 +3720,29 @@ msgid "Twitter Password"
 msgstr ""
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -3205,33 +3753,43 @@ msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -3248,18 +3806,19 @@ msgid "The subscription has been rejected, but no "
 msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3269,89 +3828,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
-msgstr ""
+msgstr "Over: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "Uw abonnement op %s is opgezegd"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
-msgstr ""
+msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3359,11 +3940,11 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3378,7 +3959,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -3390,7 +3971,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3399,78 +3980,100 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
-msgstr ""
+msgstr "Postvak IN"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
-msgstr ""
+msgstr "Uw inkomende berichten"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
-msgstr ""
+msgstr "Postvak UIT"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
-msgstr ""
+msgstr "Uw verzonden berichten"
 
 #: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
-msgstr ""
+msgstr "Instellingen voor Twitter-integratie"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
-msgstr ""
+msgstr "Aan"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
-msgstr ""
+msgstr "Het was niet mogelijk het bericht te verwerken."
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
+#, php-format
 msgid "%s and friends, page %d"
-msgstr "%s en vrienden"
+msgstr "%s en vrienden, pagina %d"
 
 #: actions/avatarsettings.php:76
 msgid "You can upload your personal avatar."
-msgstr ""
+msgstr "U kunt uw persoonlijke avatar uploaden."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-#, fuzzy
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
-msgstr "Instellingen"
+msgstr "Avatarinstellingen"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
-msgstr ""
+msgstr "Origineel"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
-msgstr ""
+msgstr "Voorvertoning"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
-msgstr ""
+msgstr "Uitsnijden"
 
 #: actions/avatarsettings.php:248 actions/deletenotice.php:133
 #: actions/emailsettings.php:224 actions/grouplogo.php:307
@@ -3482,131 +4085,148 @@ msgstr ""
 #: actions/subedit.php:38 actions/twittersettings.php:290
 #: actions/userauthorization.php:39
 msgid "There was a problem with your session token. "
-msgstr ""
+msgstr "Er was een probleem met uw sessietoken. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
-msgstr ""
+msgstr "Ons databestand is verloren gegaan."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
-msgstr "Onbekend bericht."
+msgstr "Het bestand is zoekgeraakt."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
-msgstr ""
+msgstr "Onbekend bestandstype"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
-msgstr ""
+msgstr "Er is geen profiel opgegeven."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
-msgstr ""
+msgstr "Er is geen profiel met dat ID."
 
-#: actions/block.php:111
-#, fuzzy
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
-msgstr "Onbekende gebruiker."
+msgstr "Gebruiker blokkeren"
 
 #: actions/block.php:129
 msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/block.php:162
-#, fuzzy
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
-msgstr "Je bent al aangemeld!"
+msgstr "U hebt deze gebruiker reeds geblokkeerd."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
 #: actions/confirmaddress.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "The address \"%s\" has been "
-msgstr "Het adres was verwijderd."
+msgstr "Het adres \"%s\" is "
 
 #: actions/deletenotice.php:73
 msgid "You are about to permanently delete a notice. "
-msgstr ""
+msgstr "U staat op het punt een kennisgeving permanent te verwijderen. "
 
 #: actions/disfavor.php:94
 msgid "Add to favorites"
-msgstr ""
+msgstr "Aan favorieten toevoegen"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
-msgstr ""
+msgstr "Groep %s bewerken"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
-msgstr ""
+msgstr "Postvak IN moet ingeschakeld zijn voordat groepen kunnen werken"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
-msgstr "Geen gebruikersnaam."
+msgstr "Geen gebruikersnaam"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
-msgstr "Onbekend bericht."
+msgstr "Deze groep bestaat niet"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
-msgstr ""
+msgstr "U moet beheerder zijn om de groep te kunnen bewerken"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
-msgstr ""
+msgstr "Gebruik dit formulier om de groep te bewerken."
 
 #: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
 msgid "Nickname must have only lowercase letters "
-msgstr ""
-"Gebruikersnaam moet bestaan uit alleen kleine letters en cijfers en geen "
-"spaties."
+msgstr "De gebruikersnaam moet bestaan uit alleen kleine letters "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
-msgstr "Biografie is te lang (maximaal 140 tekens)"
+msgstr "de beschrijving is te lang (maximaal 140 tekens)."
 
-#: actions/editgroup.php:218
-#, fuzzy
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
-msgstr "Kon gebruiker niet actualiseren."
+msgstr "Het was niet mogelijk de groep bij te werken."
 
-#: actions/editgroup.php:226
-#, fuzzy
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
-msgstr "Instellingen opgeslagen."
+msgstr "De instellingen zijn opgeslagen."
 
 #: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "Awaiting confirmation on this address. "
-msgstr "Fout bij bevestigingscode."
+msgstr "Dit adres wacht nog op bevestiging. "
 
 #: actions/emailsettings.php:139 actions/smssettings.php:150
 msgid "Make a new email address for posting to; "
@@ -3616,23 +4236,22 @@ msgstr ""
 msgid "Send me email when someone "
 msgstr ""
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #: actions/emailsettings.php:321
-#, fuzzy
 msgid "That email address already belongs "
-msgstr "E-mailadres bestaat al."
+msgstr "Dat e-mailadres hoort al bij "
 
 #: actions/emailsettings.php:343
-#, fuzzy
 msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
-"Een bevestigingscode is verstuurd naar het opgegeven IM-adres. Je moet ermee "
-"accoord gaan dat %s boodschappen aan jou stuurt."
+"Er is een bevestigingscode verzonden naar het e-mailadres dat u hebt "
+"opgegeven. "
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3646,71 +4265,81 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
-msgstr ""
+msgstr "Overslaan"
 
-#: actions/facebookhome.php:235
-#, fuzzy
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
-msgstr "Geen inhoud!"
+msgstr "De mededeling heeft geen inhoud!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
-msgstr ""
+msgstr "Paginering"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
-msgstr "« Later"
+msgstr "Na"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
-msgstr "Eerder »"
+msgstr "Voor"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr ""
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
+#, php-format
 msgid "Invite your friends to use %s"
-msgstr "Feed voor vrienden van %s"
+msgstr "Uw vrienden uitnodigen %s te gebruiken"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
 
 #: actions/facebookremove.php:56
-#, fuzzy
 msgid "Couldn't remove Facebook user."
-msgstr "Kon gebruiker niet actualiseren."
+msgstr "Het was niet mogelijk de Facebook-gebruiker te verwijderen."
 
 #: actions/facebooksettings.php:65
 msgid "There was a problem saving your sync preferences!"
 msgstr ""
 
 #: actions/facebooksettings.php:67
-#, fuzzy
 msgid "Sync preferences saved."
-msgstr "Voorkeuren opgeslagen."
+msgstr "De synchronisatievoorkeuren zijn opgeslagen."
 
 #: actions/facebooksettings.php:90
 msgid "Automatically update my Facebook status with my notices."
@@ -3721,9 +4350,8 @@ msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
 #: actions/facebooksettings.php:106
-#, fuzzy
 msgid "Prefix"
-msgstr "Profiel"
+msgstr "Voorvoegsel"
 
 #: actions/facebooksettings.php:108
 msgid "A string to prefix notices with."
@@ -3735,31 +4363,32 @@ msgid "If you would like %s to automatically update "
 msgstr ""
 
 #: actions/facebooksettings.php:147
-#, fuzzy
 msgid "Sync preferences"
-msgstr "Voorkeuren"
+msgstr "Synchronisatievoorkeuren"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
-msgstr ""
+msgstr "Van favotietenlijst verwijderen"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-#, fuzzy
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
-msgstr "Populaire berichten"
+msgstr "Populaire mededelingen"
 
 #: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Popular notices, page %d"
-msgstr "Populaire berichten, pagina %d"
+msgstr "Populaire mededelingen, pagina %d"
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
-msgstr "De meest populaire berichten op de site op dit moment."
+msgstr "De meest populaire mededelingen op de site op dit moment."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Nieuwe gebruikers"
 
@@ -3773,34 +4402,39 @@ msgstr "Nieuwe gebruikers, pagina %d"
 msgid "A selection of some of the great users on %s"
 msgstr "Een selectie van de actieve gebruikers op %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
-msgstr "Die gebruiker is geblokkeerd voor inschrijving"
+msgstr ""
+"Die gebruiker heeft de mogelijkheid om te abonneren voor u geblokkeerd."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "Geen ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
-msgstr "Groeps logo"
+msgstr "Groepslogo"
 
 #: actions/grouplogo.php:149
 msgid "You can upload a logo image for your group."
-msgstr "Je kan hier een logo voor je groep uploaden"
+msgstr "U kunt een logo voor uw groep uploaden."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Logo geactualiseerd."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
-msgstr "Actualiseren van je logo is niet gelukt."
+msgstr "Het bijwerken van het logo is mislukt."
 
 #: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
 msgid "%s group members"
-msgstr "%s groeps leden"
+msgstr "leden van de groep %s"
 
 #: actions/groupmembers.php:96
 #, php-format
@@ -3809,10 +4443,11 @@ msgstr "% groeps leden, pagina %d"
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
-msgstr "Lijst van de leden in deze groep"
+msgstr "Ledenlijst van deze groep"
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Groepen"
 
@@ -3827,8 +4462,9 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
-msgstr "Maak een nieuw groep aan"
+msgstr "Nieuwe groep aanmaken"
 
 #: actions/groupsearch.php:57
 #, php-format
@@ -3839,13 +4475,13 @@ msgstr ""
 "interesses. Scheid de zoektermen met spaties; ze moeten uit 3 of meer tekens "
 "bestaan."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
-msgstr "Groep zoeken"
+msgstr "Groepen zoeken"
 
 #: actions/imsettings.php:70
 msgid "You can send and receive notices through "
-msgstr "Je kan berichten zenden en ontvangen via_"
+msgstr "U kunt mededelingen zenden en ontvangen via "
 
 #: actions/imsettings.php:120
 #, php-format
@@ -3859,64 +4495,70 @@ msgstr "Stuur mij reacties via Jabber/GTalk."
 #: actions/imsettings.php:321
 #, php-format
 msgid "A confirmation code was sent "
-msgstr "Een bevestigingscode is gezonden naar_"
+msgstr "Er is een bevestigingscode verzonden naar "
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
-msgstr "Je moet ingelogd zijn om deze groep bij te wonen"
+msgstr "U moet aangemeld zijn om lid te worden van een groep."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
-msgstr "Je bent al aangemeld bij deze groep!"
+msgstr "U bent al lid van deze groep"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
-msgstr "Kan de gebruiker %s niet aan de %s groep toevoegen "
+msgstr "Het was niet mogelijk om de gebruiker %s toe te voegen aan de groep %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
-msgstr "% is bij de groep gekomen %s"
+msgstr "%s is lid geworden van de groep %s"
 
 #: actions/leavegroup.php:60
 msgid "Inboxes must be enabled for groups to work."
-msgstr "De inbox moet aan staan voor groepen om te kunnen functioneren"
+msgstr "Postvak IN moet ingeschakeld zijn voordat groepen functioneren."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
-msgstr "Je moet ingelogd zijn om uit te schrijven uit de groep"
+msgstr "U moet aangemeld zijn om een groep te kunnen verlaten."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
-msgstr "Groep onbekend"
+msgstr "De opgegeven groep bestaat niet."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
-msgstr "Je bent geen lid van deze groep"
+msgstr "U bent geen lid van deze groep"
 
 #: actions/leavegroup.php:100
 msgid "You may not leave a group while you are its administrator."
-msgstr ""
-"Als administrator/eigenaar van de groep kan je niet je lidmaatschap opgeven"
+msgstr "Als u beheerder van een groep bent, kunt u deze niet verlaten."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
-msgstr "Kon geen member vinden"
+msgstr "Er is geen groepslidmaatschap aangetroffen."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
-msgstr "Kan de gebruiker %s niet verwijderen uit de groep %s"
+msgstr "De gebruiker %s kon niet uit de groet %s verwijderd worden"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
-msgstr "%s heeft de groep verlaten %s"
+msgstr "%s heeft de groep %s verlaten"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
-msgstr "Login op de website"
+msgstr "Aanmelden"
 
 #: actions/microsummary.php:69
 msgid "No current status"
@@ -3926,110 +4568,118 @@ msgstr "Geen huidige status"
 msgid "New group"
 msgstr "Nieuwe groep"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
-msgstr "Gebruik dit formulier voor de nieuwe groep te maken"
+msgstr "Gebruik dit formulier om een nieuwe groep aan te maken."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
-msgstr "Kan de groep niet maken"
+msgstr "Het was niet mogelijk de groep aan te maken."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
-msgstr "Kan de groeps-lidmaatschap niet aanmaken"
+msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen."
 
 #: actions/newmessage.php:119 actions/newnotice.php:132
 msgid "That's too long. "
-msgstr "Dit is te lang._"
+msgstr "Dat is te lang. "
 
 #: actions/newmessage.php:134
 msgid "Don't send a message to yourself; "
-msgstr "Geen berichten naar jezelf zenden; _"
+msgstr "Zend uzelf geen berichten. "
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
-msgstr "Berichten gepubliceerd "
+msgstr "De mededeling is verzonden"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
-msgstr "Ajax fout"
+msgstr "Er is een Ajax-fout opgetreden"
 
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"Deze gebruiker is het niet mogelijk nudges te hebben en/of heeft een niet "
-"bevestigd e-mailadres"
+"Deze gebruiker is niet te porren of heeft zijn e-mailadres nog niet "
+"bevestigd."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
-msgstr "Nudge verzonden"
+msgstr "De por is verzonden"
 
 #: actions/nudge.php:97
 msgid "Nudge sent!"
-msgstr "Nudge verzonden!"
+msgstr "De por is verzonden!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
-msgstr "Log in met OpenID"
+msgstr "Aanmelden met OpenID"
 
 #: actions/openidsettings.php:128
 msgid "Removing your only OpenID "
-msgstr "Verwijder je enigste OpenID"
+msgstr "Nu wordt uw laatste OpenID verwijderd "
 
 #: actions/othersettings.php:60
 msgid "Other Settings"
-msgstr "Andere instellingen"
+msgstr "Overige instellingen"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
-msgstr "Beheer verschillende andere optie´s"
+msgstr "Overige instellingen beheren."
 
 #: actions/othersettings.php:93
-#, fuzzy
 msgid "URL Auto-shortening"
-msgstr "URL auto-sorteren"
+msgstr "URL's automatisch inkorten"
 
 #: actions/othersettings.php:112
 msgid "Service"
-msgstr "Service"
+msgstr "Dienst"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
-msgstr "Automatische verkorting dienst te gebruiken"
+msgstr "Te gebruiken automatische verkortingsdienst."
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL verkorting dienst is te lang (max. 50tekens)."
+msgstr "De URL voor de verkortingdienst is te lang (maximaal 50 tekens)."
 
 #: actions/passwordsettings.php:69
 msgid "Change your password."
-msgstr "Verander je wachtwoord"
+msgstr "Wachtwoord wijzigen"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
-msgstr "Wachtwoord veranderd"
+msgstr "Wachtwoord wijzigen"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
-msgstr "Geen geldige personen-tag: %s"
+msgstr "Geen geldig gebruikerslabel: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
-msgstr "Gebruikers eigen-tagged met %s - page %d"
+msgstr "Gebruikers die zichzelf met %s hebben gelabeld - pagina %d"
 
 #: actions/peopletag.php:91
 #, php-format
 msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Er zijn gebruikers die hebben hunzelf getagged \"%s\""
+msgstr "Dit zijn de gebruikers die zichzelf \"%s\" hebben gelabeld "
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
-msgstr "Profiel informatie"
+msgstr "Profielinformatie"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4039,22 +4689,27 @@ msgid "Automatically subscribe to whoever "
 msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "Ongeldige tag: '%s'"
+msgstr "Ongeldig label: '%s'"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
-msgstr "Kon de tags niet opslaan."
+msgstr "Het was niet mogelijk de labels op te slaan."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Openbare tijdlijn, pagina %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "Het was niet mogelijk de publieke stream op te halen."
 
 #: actions/public.php:220
 #, php-format
@@ -4065,59 +4720,59 @@ msgstr ""
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
-msgstr "Publieke tag-wolk"
+msgstr "Publieke woordwolk"
 
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
-msgstr "De meest recente en populairste tags %s_"
+msgstr "De meest recente en populairste labels op %s "
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
-msgstr "Tag-wolk"
+msgstr "Woordwolk"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
-msgstr "Sorry, maar alleen uitgenodigde mensen kunnen registeren"
+msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
 
 #: actions/register.php:149
 msgid "You can't register if you don't "
-msgstr "Je kunt niet registreren als je niet_"
+msgstr "U kunt zich niet registeren als u niet "
 
 #: actions/register.php:286
 msgid "With this form you can create "
-msgstr "Met dit formulier maak je_"
+msgstr "Met dit formulier maakt u "
 
 #: actions/register.php:368
 msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties_"
+msgstr "Een to 64 kleine letters of cijfers, "
 
 #: actions/register.php:382 actions/register.php:386
 msgid "Used only for updates, announcements, "
-msgstr "Alleen gebruikt voor updates, aankondigingen _"
+msgstr "Alleen gebruikt voor updates, aankondigingen, "
 
 #: actions/register.php:398
 msgid "URL of your homepage, blog, "
-msgstr "URL van je homepage, blog, _"
+msgstr "URL van uw thuispagina, blog, "
 
 #: actions/register.php:404
 msgid "Describe yourself and your "
-msgstr "Beschrijf jezelf en je_"
+msgstr "Beschrijf uzelf en uw "
 
 #: actions/register.php:410
 msgid "Where you are, like \"City, "
-msgstr "Waar je bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\"_"
+msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\", "
 
 #: actions/register.php:432
 msgid " except this private data: password, "
-msgstr ""
-"_behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
-"telefoonnummer._"
+msgstr " behalve de volgende privégegevens: wachtwoord, "
 
 #: actions/register.php:471
 #, php-format
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Gefeliciteer, %s en welkom op de site \"%%site.name%%._"
+msgstr "Gefeliciteerd, %s. Welkom bij \"%%site.name%%. "
 
 #: actions/register.php:495
 msgid "(You should receive a message by email "
@@ -4127,7 +4782,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Antwoorden aan %s, pagina %d"
@@ -4135,53 +4791,73 @@ msgstr "Antwoorden aan %s, pagina %d"
 #: actions/showfavorites.php:79
 #, php-format
 msgid "%s favorite notices, page %d"
-msgstr ""
+msgstr "%s favoriete mededelingen, pagina %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s groep"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
-msgstr "%s groep, pagina %d"
+msgstr "groep %s, pagina %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
-msgstr "Groeps profiel"
+msgstr "Groepsprofiel"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
-msgstr "Bericht"
+msgstr "Opmerking"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
-msgstr "Groeps aktie"
+msgstr "Groepshandelingen"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
-msgstr "Berichten-feed voor groep %s"
+msgstr "Mededelingenfeed voor de groep %s"
 
-#  String should contain a variable token for since 'when'
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
-msgstr "Lid"
+msgstr "Leden"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(geen)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "Alle leden"
 
@@ -4191,14 +4867,14 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** is een gebruikersgroep op  %%%%site.name%%%%, een [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service_"
+"**%s** is een gebruikersgroep op  %%%%site.name%%%%, een [microblogdienst]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) "
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
-msgstr "Alleen de zender en ontvanger_"
+msgstr "Alleen de afzender en ontvanger "
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, pagina %d"
@@ -4208,30 +4884,37 @@ msgid "'s profile"
 msgstr "'s profiel"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "Gebruikersprofiel"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Foto"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
-msgstr "Gebruikers akties"
+msgstr "Gebruikershandelingen"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
-msgstr "Stuur de gebruiker een direct bericht"
+msgstr "Deze gebruiker een direct bericht zenden"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Bericht"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "Alle abonnees"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "Alle groepen"
 
@@ -4241,122 +4924,114 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** heeft een account op %%%%site.name%%%%, een [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service_"
+"**%s** heeft een gebruiker op %%%%site.name%%%%, een [microblogdienst]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) "
 
 #: actions/smssettings.php:128
 msgid "Phone number, no punctuation or spaces, "
-msgstr "Telefoonnummer, geen leestekens of spaties,_"
+msgstr "Telefoonnummer zonder leestekens of spaties, "
 
 #: actions/smssettings.php:162
-#, fuzzy
 msgid "Send me notices through SMS; "
-msgstr "Stuur mij berichten via Jabber/GTalk."
+msgstr "Kennisgevingen via SMS naar mij sturen; "
 
 #: actions/smssettings.php:335
-#, fuzzy
 msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Die bevestigingscode is niet voor jou!"
+msgstr ""
+"Er is een bevestigingscode verstuurd naar het telefoonnummer dat u hebt "
+"opgegeven. "
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
-msgstr ""
+msgstr "Mobiele aanbieder"
 
 #: actions/subedit.php:70
-#, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr "Je hebt dat profiel niet ingezonden"
+msgstr "U bent niet geabonneerd op dat profiel."
 
 #: actions/subedit.php:83
-#, fuzzy
 msgid "Could not save subscription."
-msgstr "Kon abonnement niet aanmaken."
+msgstr "Het was niet mogelijk het abonnement op te slaan."
 
 #: actions/subscribe.php:55
-#, fuzzy
 msgid "Not a local user."
-msgstr "Onbekende gebruiker."
+msgstr "Dit is geen lokale gebruiker."
 
 #: actions/subscribe.php:69
-#, fuzzy
 msgid "Subscribed"
-msgstr "Abonneren"
+msgstr "Geabonneerd"
 
 #: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers"
-msgstr "Abonnees"
+msgstr "%s abonnees"
 
 #: actions/subscribers.php:52
 #, php-format
 msgid "%s subscribers, page %d"
-msgstr ""
+msgstr "%s abonnees, pagina %d"
 
 #: actions/subscribers.php:63
-#, fuzzy
 msgid "These are the people who listen to "
-msgstr "Dit zijn de mensen die %s's berichten volgen."
+msgstr "Dit zijn de gebruikers die luisteren naar "
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "These are the people who "
-msgstr "Dit zijn de mensen die %s's berichten volgen."
+msgstr "Dit zijn de gebruikers die "
 
 #: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
-msgstr "Alle abonnementen"
+msgstr "%s abonnementen"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions, page %d"
-msgstr "Alle abonnementen"
+msgstr "%s abonnementen, pagina %d"
 
 #: actions/subscriptions.php:65
-#, fuzzy
 msgid "These are the people whose notices "
-msgstr "Dit zijn de mensen van wie %s de berichten volgt."
+msgstr "Dit zijn de gebruikers wiens kennsigevingen "
 
 #: actions/subscriptions.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "These are the people whose "
-msgstr "Dit zijn de mensen die %s's berichten volgen."
+msgstr "Dit zijn de gebruikers wiens "
 
-#: actions/subscriptions.php:122
-#, fuzzy
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
-msgstr "Geen Jabber-ID."
+msgstr "Jabber"
 
-#: actions/tag.php:43
-#, fuzzy, php-format
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
+#, php-format
 msgid "Notices tagged with %s, page %d"
-msgstr "Microblog van %s"
+msgstr "Kennisgevingen met het label %s, pagina %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
 
 #: actions/tagother.php:33
-#, fuzzy
 msgid "Not logged in"
-msgstr "Niet ingelogd."
+msgstr "Niet aangemeld."
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No id argument."
-msgstr "Onbekend document."
+msgstr "Geen ID-argument."
 
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
-msgstr ""
+msgstr "Label %s"
 
 #: actions/tagother.php:141
 msgid "Tag user"
-msgstr ""
+msgstr "Gebruiker labelen"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4366,319 +5041,319 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
-#, fuzzy
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
-msgstr "Kon avatarinformatie niet opslaan"
+msgstr "Het was niet mogelijk de labels op te slaan."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
 #: actions/tagrss.php:35
-#, fuzzy
 msgid "No such tag."
-msgstr "Onbekend bericht."
+msgstr "Onbekend label."
 
-#: actions/tagrss.php:66
-#, fuzzy, php-format
+#: actions/tagrss.php:66 actions/tagrss.php:64
+#, php-format
 msgid "Microblog tagged with %s"
-msgstr "Microblog van %s"
+msgstr "Microblog met label %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
-msgstr ""
+msgstr "Het blokkeren van de gebruiker is mislukt."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
-msgstr ""
+msgstr "Het deblokkeren van de gebruiker is mislukt."
 
-#: actions/twitapiusers.php:48
-#, fuzzy
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
-msgstr "Geen verzoek gevonden!"
+msgstr "Niet aangetroffen."
 
 #: actions/twittersettings.php:71
 msgid "Add your Twitter account to automatically send "
-msgstr ""
+msgstr "Uw Twitter-gebruiker toevoegen om automatisch "
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
-msgstr ""
+msgstr "Gebruikersnaam bij Twitter"
 
-#: actions/twittersettings.php:126
-#, fuzzy
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
-msgstr "Nieuw wachtwoord"
+msgstr "Twitter-wachtwoord"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
-msgstr ""
+msgstr "Twitter-vrienden"
 
 #: actions/twittersettings.php:327
 msgid "Username must have only numbers, "
-msgstr ""
+msgstr "Gebruikersnamen moeten uit alleen getallen bestaan, "
 
 #: actions/twittersettings.php:341
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to retrieve account information "
-msgstr "Kon e-mailbevestiging niet verwijderen."
+msgstr "Het was niet mogelijk om de gebruikersinformatie op te halen. "
 
-#: actions/unblock.php:108
-#, fuzzy
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
-msgstr "Fout bij opslaan van de gebruiker."
+msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade."
 
-#: actions/unsubscribe.php:50
-#, fuzzy
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
-msgstr "Geen profiel-URL teruggestuurd door de server."
+msgstr "Het profiel-ID was niet aanwezig in het verzoek."
 
-#: actions/unsubscribe.php:57
-#, fuzzy
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
-msgstr "Profiel op afstand zonder overeenkomend profiel"
+msgstr "Er is geen profiel met dat ID."
 
-#: actions/unsubscribe.php:71
-#, fuzzy
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
-msgstr "Abonnement opheffen"
+msgstr "Het abonnement is opgezegd"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
-msgstr ""
+msgstr "%s groepen"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
-msgstr ""
+msgstr "%s groepen, pagina %d"
 
-#: classes/Notice.php:104
-#, fuzzy
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
-msgstr "Probleem bij opslaan bericht."
+msgstr ""
+"Er was een probleem bij het opslaan vna de kennisgeving. De gebruiker is "
+"onbekend."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
+"U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer "
+"het over enige tijd weer."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
+"U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site."
 
-#: lib/accountsettingsaction.php:108
-#, fuzzy
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
-msgstr "Actualiseren avatar niet gelukt."
+msgstr "Avatar uploaden"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
-msgstr ""
+msgstr "Overige"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
-msgstr ""
+msgstr "Overige instellingen"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
-msgstr ""
+msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
-msgstr ""
+msgstr "Naamloze pagina"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
-msgstr ""
+msgstr "Primaire sitenavigatie"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "Persoonlijk profiel en tijdlijn van vrienden"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
-msgstr ""
+msgstr "Naar gebruikers of tekst zoeken"
 
-#  This would be appropriate for the footer menu link (actual context isn't clear!)
-#: lib/action.php:328
-#, fuzzy
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
-msgstr "Over ons"
+msgstr "Gebruiker"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
-msgstr ""
+msgstr "Met IM, SMS of Twitter verbinden"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
-msgstr ""
+msgstr "Van de site afmelden"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
-msgstr ""
+msgstr "Bij de site aanmelden"
 
-#: lib/action.php:338
-#, fuzzy
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
-msgstr "Maak een nieuw account aan"
+msgstr "Gebruiker aanmaken"
 
-#: lib/action.php:341
-#, fuzzy
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
-msgstr "Die OpenID is niet bekend."
+msgstr "Aanmelden met OpenID"
 
-#: lib/action.php:344
-#, fuzzy
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
-msgstr "Help"
+msgstr "Help me!"
 
-#: lib/action.php:362
-#, fuzzy
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
-msgstr "Nieuw bericht"
+msgstr "Kennisgeving van site"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
-#, fuzzy
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
-msgstr "Nieuw bericht"
+msgstr "Kennisgeving van pagina"
 
-#: lib/action.php:562
-#, fuzzy
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
-msgstr "Abonnementen"
+msgstr "Secundaire sitenavigatie"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
-msgstr ""
+msgstr "Licentie van de StatusNet-software"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
-msgstr ""
+msgstr "Alle "
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
-msgstr ""
+msgstr "licentie."
 
-#: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
-msgstr "Onbekende gebruiker."
+msgstr "Deze gebruiker blokkeren"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
-msgstr ""
+msgstr "Blokkeren"
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
-msgstr ""
+msgstr "Mededeling uit favorieten verwijderen"
 
 #: lib/facebookaction.php:268
 #, php-format
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
-#, fuzzy
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
-msgstr "Maak een nieuw account aan"
+msgstr " een nieuwe gebruiker."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
-msgstr "Openbaar"
+msgstr "Gepubliceerd"
 
 #: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
 msgid "Favor this notice"
-msgstr "Onbekend bericht."
+msgstr "Deze kennisgeving op de favorietenlijst plaatsen"
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr ""
+msgstr "Gegevens exporteren"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
-msgstr ""
+msgstr "Labels filteren"
 
 #: lib/galleryaction.php:131
 msgid "All"
-msgstr ""
+msgstr "Alle"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
-msgstr ""
+msgstr "Label"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "Kies een label om de lijst kleiner te maken"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
-msgstr ""
+msgstr "OK"
 
-#: lib/groupeditform.php:148
-#, fuzzy
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
-msgstr "URL van je homepage, blog, of profiel op een andere site"
+msgstr "De URL van de thuispagina of de blog van de groep of het onderwerp"
 
-#: lib/groupeditform.php:151
-#, fuzzy
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
-msgstr "Abonnementen"
+msgstr "Beschrijving"
 
-#: lib/groupeditform.php:153
-#, fuzzy
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
-msgstr "Beschrijf jezelf en je interesses in 140 tekens"
+msgstr "Beschrijf de groep of het onderwerp in maximaal 140 karakters"
 
-#: lib/groupeditform.php:158
-#, fuzzy
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Waar je bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
+msgstr ""
+"Locatie voor de groep - als relevant. Iets als \"Plaats, regio, land\"."
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
-msgstr ""
+msgstr "Groep"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
-msgstr ""
+msgstr "Beheerder"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "Eigenschappen van de groep %s bewerken"
 
-#: lib/groupnav.php:106
-#, fuzzy
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
-msgstr "Uitloggen"
+msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Logo voor %s toevoegen of verwijderen"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
-msgstr ""
+msgstr "Groepen met de meeste leden"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
@@ -4690,29 +5365,24 @@ msgid "Tags in %s group's notices"
 msgstr ""
 
 #: lib/htmloutputter.php:104
-#, fuzzy
 msgid "This page is not available in a "
-msgstr "Deze pagina is niet beschikbaar in een mediatype dat jij accepteert"
+msgstr "Deze pagina is niet beschikbaar in een "
 
 #: lib/joinform.php:114
-#, fuzzy
 msgid "Join"
-msgstr "Inloggen"
+msgstr "Toetreden"
 
 #: lib/leaveform.php:114
-#, fuzzy
 msgid "Leave"
-msgstr "Opslaan"
+msgstr "Verlaten"
 
-#: lib/logingroupnav.php:76
-#, fuzzy
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
-msgstr "Ongeldige gebruikersnaam of wachtwoord."
+msgstr "Aanmelden met gebruikersnaam en wachtwoord"
 
-#: lib/logingroupnav.php:79
-#, fuzzy
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
-msgstr "Maak een nieuw account aan"
+msgstr "Nieuwe gebruiker aanmaken"
 
 #: lib/logingroupnav.php:82
 msgid "Login or register with OpenID"
@@ -4724,30 +5394,34 @@ msgid ""
 "Hey, %s.\n"
 "\n"
 msgstr ""
+"Hallo, %s.\n"
+"\n"
 
 #: lib/mail.php:236
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is now listening to "
-msgstr "%1$s volgt nu je berichten op %2$s."
+msgstr "%1$s luistert nu naar "
 
-#: lib/mail.php:254
-#, fuzzy, php-format
+#: lib/mail.php:254 lib/mail.php:253
+#, php-format
 msgid "Location: %s\n"
 msgstr "Locatie: %s\n"
 
-#: lib/mail.php:256
-#, fuzzy, php-format
+#: lib/mail.php:256 lib/mail.php:255
+#, php-format
 msgid "Homepage: %s\n"
-msgstr "Homepage: %s\n"
+msgstr "Thuispagina: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
+"Beschrijving: %s\n"
+"\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
@@ -4758,50 +5432,53 @@ msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 
 #: lib/mail.php:555
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s volgt nu je berichten op %2$s."
+msgstr "%1$s heeft zojuist uw kennisgeving van %2$s toevoegd"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-#, fuzzy
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
-msgstr " van "
+msgstr "Van"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
-msgstr ""
+msgstr "Directe mededeling verzenden"
 
-#: lib/noticeform.php:125
-#, fuzzy
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
-msgstr "Nieuw bericht"
+msgstr "Mededeling verzenden"
 
-#: lib/noticeform.php:152
-#, fuzzy
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
-msgstr "6 of meer tekens"
+msgstr "Beschikbare tekens"
 
-#: lib/noticelist.php:426
-#, fuzzy
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "in antwoord op"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
-msgstr ""
+msgstr "Op deze mededeling antwoorden"
 
-#: lib/noticelist.php:451
-#, fuzzy
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
-msgstr "antwoord"
+msgstr "Antwoorden"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
-msgstr ""
+msgstr "Deze mededeling verwijderen"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
-msgstr ""
+msgstr "Verwijderen"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
@@ -4818,72 +5495,73 @@ msgstr ""
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
-msgstr ""
+msgstr "Labels in de mededelingen van %s"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
-msgstr ""
+msgstr "(geen)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Openbaar"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
-msgstr ""
+msgstr "Gebruikersgroepen"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
-msgstr ""
+msgstr "Recente labels"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
-#, fuzzy
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
-msgstr "Personen zoeken"
+msgstr "Populair"
 
 #: lib/searchgroupnav.php:82
-#, fuzzy
 msgid "Notice"
-msgstr "Berichten"
+msgstr "Mededeling"
 
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
-msgstr ""
+msgstr "Groepen op deze site vinden"
 
 #: lib/section.php:89
 msgid "Untitled section"
-msgstr ""
+msgstr "Naamloze sectie"
 
-#: lib/subgroupnav.php:81
-#, fuzzy, php-format
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
+#, php-format
 msgid "People %s subscribes to"
-msgstr "Abonneren op afstand"
+msgstr "Gebruikers waarop %s een abonnement heeft"
 
-#: lib/subgroupnav.php:89
-#, fuzzy, php-format
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
+#, php-format
 msgid "People subscribed to %s"
-msgstr "Abonneren op afstand"
+msgstr "Gebruikers met een abonnement op %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
 
-#: lib/subs.php:53
-#, fuzzy
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
-msgstr "De gebruiker heeft je geblokkeerd."
+msgstr "Deze gebruiker negeert u."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Abonnement geautoriseerd"
 
@@ -4893,13 +5571,14 @@ msgstr "Geen"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr ""
+msgstr "Meest actieve gebruikers"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Deblokkeer deze gebruiker."
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Deblokkeer"
 
@@ -4907,23 +5586,2003 @@ msgstr "Deblokkeer"
 msgid "Unsubscribe from this user"
 msgstr "Uitschrijven van deze gebruiker"
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed voor vrienden van %s (RSS 1.0)"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed voor vrienden van %s (RSS 2.0)"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed voor vrienden van %s (Atom)"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+msgid "You and friends"
+msgstr "U en vrienden"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+"U kunt een persoonlijke avatar uploaden. De maximale bestandsgrootte is %s."
+
+#: actions/avatarsettings.php:373
+msgid "Avatar deleted."
+msgstr "De avatar is verwijderd."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"U staat op het punt een mededeling permanent te verwijderen. Als dit "
+"uitgevoerd is, kan het niet ongedaan gemaakt worden."
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+"Er is een probleem ontstaan met uw sessietoken. Probeer het nog een keer."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+"Mij een e-mail sturen als iemand mij een antwoord met \"@\" erin stuurt."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+"Hier kunt u een logo voor uw groep uploaden. De maximale bestandsgrootte is %"
+"s."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, php-format
+msgid "Microblog by %s group"
+msgstr "Microblog door de groep %s"
+
+#: actions/groupsearch.php:57 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 ""
+"Zoeken naar groepen op %%site.name%% op basis van naam, locatie of "
+"interesses of beschrijving. Scheid de zoektermen met spaties. Iedere "
+"zoekterm moet uit drie of meer tekens bestaan."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Zoekresultaten voor \"%s\" op %s"
+
+#: actions/openidlogin.php:66
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Om veiligheidsredenen vragen we u opnieuw aan te melden met uw [OpenID](%%"
+"doc.openid%%) alvorens u uw instellingen kunt wijzigen."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Publieke streamfeed (RSS 1.0)"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Publieke streamfeed (RSS 1.0)"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+msgid "Public Stream Feed (Atom)"
+msgstr "Publieke streamfeed (Atom)"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
+"telefoonnummer."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr "Aangemaakt"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+msgid "Your profile"
+msgstr "Uw profiel"
+
+#: actions/showstream.php:149
+#, php-format
+msgid "%s's profile"
+msgstr "Profiel van %s"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Mededelingenfeed voor %s (RSS 1.0)"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Mededelingenfeed voor %s (RSS 2.0)"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Mededelingenfeed voor %s (Atom)"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format
+msgid "FOAF for %s"
+msgstr "Vriend van een vriend (FOAF) voor %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+msgid "Edit Avatar"
+msgstr "Avatar bewerken"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+msgid "Edit profile settings"
+msgstr "Profielinstellingen bewerken"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+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 ""
+"Er is een bevestigingscode is verzonden naar het telefoonnummer dat u hebt "
+"toegevoegd. Controleer uw telefoon voor de code en instructies."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+msgid "No such user!"
+msgstr "Deze gebruiker bestaat niet."
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr ""
+"Het was niet mogelijk de gebruikersgegeven voor \"%s\" op te halen van "
+"Twitter."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+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 ""
+"Controleer de details alstublieft om er zeker van te zijn u zich wilt "
+"abonneren op de mededelingen van deze gebruiker. Als u zojuist geen verzoek "
+"hebt gedaan om te abonneren op de mededelingen van een andere gebruiker, "
+"klik dan op \"Afkeuren\""
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr "Databasefout"
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"Om de Facebook-applicatie te kunnen gebruiken moet u aanmelden met uw "
+"gebruikersnaam en wachtwoord. Hebt u nog geen gebruikersnaam? "
+
+#: 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 "Vrienden van vrienden (FOAF)"
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, 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 ""
+"%1$s volgt nu uw medelingen op %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"\n"
+"Met vriendelijke groet,\n"
+"%7$s.\n"
+"----\n"
+"Wijzig uw e-mailadres of instellingen op %8$s\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+msgid "Search site"
+msgstr "Site doorzoeken"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "Dat document bestaat niet."
+
+#: actions/block.php:149
+msgid "Do not block this user from this group"
+msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen"
+
+#: actions/block.php:150
+msgid "Block this user from this group"
+msgstr "Deze gebruiker de toegang tot deze groep ontzeggen"
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s geblokkeerde profielen"
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s geblokkeerde profielen, pagina %d"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr "Een lijst met voor deze groep geblokkeerde gebruikers."
+
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr "Deze gebruiker weer toegang geven tot de groep"
+
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Dialoog"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "Deze mededeling niet verwijderen"
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ongeldig alias: \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "De alias \"%s\" wordt al gebruikt. Geef een ander alias op."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+msgid "Could not create aliases."
+msgstr "Het was niet mogelijk de aliassen aan te maken."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "Geen mededelings-ID"
+
+#: actions/file.php:38
+msgid "No notice"
+msgstr "Geen mededeling"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+msgid "Not a valid invitation code."
+msgstr "Geen geldige uitnodigingscode."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "Er is geen groep aangegeven."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "Deze gebruiker is al de toegang tot de groep ontzegd."
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "De gebruiker is geen lid van de groep."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr "Gebruiker toegang tot de groep blokkeren"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "U moet aangemeld zijn om een groep te kunnen bewerken."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr "Groepsontwerpen"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+msgid "Couldn't update your design."
+msgstr "Het was niet mogelijk uw ontwerp bij te werken."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+msgid "Design preferences saved."
+msgstr "De ontwerpvoorkeuren zijn opgeslagen."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "Geen resultaten."
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr "De gebruiker is niet de toegang tot de groep ontzegd."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+msgid "Message sent"
+msgstr "Bericht verzonden."
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+msgid "Couldn't save file."
+msgstr "Het was niet mogelijk het bestand op te slaan."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"Via [OpenID](%%doc.openid%%) kunt u bij veel websites aanmelden met dezelfde "
+"gebruiker. Hier kunt u uw koppelingen met OpenID's beheren."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+msgid "View profile designs"
+msgstr "Profielontwerpen bekijken"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+"Dit is %%site.name%%, [microblogdienst](http://en.wikipedia.org/wiki/Micro-"
+"blogging) gebaseerd op de Vrije Software [StatusNet](http://status.net/)"
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Als u uw wachtwoord kwijt bent, is het mogelijk een nieuw wachtwoord te "
+"ontvangen op het e-mailadres dat aan uw gebruiker gekoppeld is."
+
+#: actions/recoverpassword.php:158
+msgid "You've been identified. Enter a new password below. "
+msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in. "
+
+#: actions/recoverpassword.php:188
+msgid "Password recover"
+msgstr "Wachtwoordherstel"
+
+#: actions/register.php:86
+msgid "Sorry, invalid invitation code."
+msgstr "Sorry. De uitnodigingscode is ongeldig."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr "Op een gebruiker uit een andere systeem abonneren"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Favoriete mededelingen van %s, pagina %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Mededelingenfeed voor groep %s (RSS 1.0)"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Mededelingenfeed voor groep %s (RSS 2.0)"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Mededelingenfeed voor groep %s (Atom)"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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** is een gebruikersgroep op %%%%site.name%%%%, een [microblogdienst]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
+"[StatusNet](http://status.net/). De leden wisselen korte mededelingen uit "
+"over hun ervaringen en interesses. "
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+msgid "Not a local notice"
+msgstr "Geen lokale mededeling"
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr " met het label %s"
+
+#: actions/showstream.php:121
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Mededelingenfeed voor %s met het label %s (RSS 1.0)"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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** heeft een gebruiker op %%%%site.name%%%%, eena [microblogdienst]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
+"[StatusNet](http://status.net/). "
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr "%s luistert nergens naar."
+
+#: actions/tag.php:77 actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Mededelingenfeed voor label %s (RSS 1.0)"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Mededelingenfeed voor label %s (Atom)"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr "Deze status is al toegevoegd aan de favorieten."
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "Deze status staat niet in de favorieten."
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+msgid "Could not determine source user."
+msgstr "Het was niet mogelijk de brongebruiker te bepalen."
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr "De doelgebruiker is niet aangegeven."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+msgid "Could not find target user."
+msgstr "Het was niet mogelijk de doelgebruiker te vinden."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Updates over %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Updates met het label %1$s op %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr "Licentie"
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+msgid "Reject this subscription"
+msgstr "Dit abonnement weigeren"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr "Profielontwerp"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr "%s is van geen enkele groep lid."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+msgid "Problem saving notice. Too long."
+msgstr ""
+"Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te "
+"lang."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+msgid "Design your profile"
+msgstr "Uw profiel ontwerpen"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr "Auteur"
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr "Provider"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr "Bestand uploaden"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr "Aan"
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr "Uit"
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Kleuren wijzigen"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Achtergrond"
+
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr "Inhoud"
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Menubalk"
+
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr "Verwijzingen"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Standaardinstellingen gebruiken"
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Standaardontwerp toepassen"
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Standaardinstellingen toepassen"
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr "Ontwerp opslaan"
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Blocked"
+msgstr "Geblokkeerd"
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "%s blocked users"
+msgstr "%s geblokkeerde gebruikers"
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+msgid "in context"
+msgstr "in context"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+msgid "Search help"
+msgstr "Hulp bij zoeken"
+
+#: 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/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s is geen geldige kleur."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Onbekend label."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Dit is te lang. De maximale lengte is 140 tekens."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "U kunt de gebruiker %s niet volgen, omdat deze gebruiker niet bestaat."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "de beschrijving is te lang (maximaal 140 tekens)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "U bent al lid van deze groep"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Het was niet mogelijk om de gebruiker %s toe te voegen aan de groep %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "U bent geen lid van deze groep"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "De gebruiker %s kon niet uit de groet %s verwijderd worden"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s groepen"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s is van geen enkele groep lid."
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Groepshandelingen"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "De avatar is verwijderd."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Dat is te lang. De maximale lengte voor mededelingen is 140 tekens."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Niet ondersteund beeldbestandsformaat."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Foto"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "de beschrijving is te lang (maximaal 140 tekens)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Updates van %1$s op %2$s."
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Gebruiker waarnaar geluisterd wordt bestaat niet."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Niet geautoriseerd."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr ""
+"Het was niet mogelijk de verzoekentokens om te zetten naar toegangstokens."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Onbekende versie van het OMB-protocol."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "De mededeling bestaat niet."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Het bestand is zoekgeraakt."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Updates van %1$s op %2$s."
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Deze pagina is niet beschikbaar in een "
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Meld u aan met uw gebruikersnaam en wachtwoord. Hebt u nog geen "
+"gebruikersnaam? [Registreer](%%action.register%%) dan een nieuw gebruiker, "
+"of probeer [OpenID](%%action.openidlogin%%)."
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Updates met het label %1$s op %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Alle updates die overeenkomen met de zoekterm \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Inhoud"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Beschrijf uzelf en uw interesses in 140 tekens"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Beschrijf uzelf en uw "
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "De beschrijving is te lang (maximaal 140 tekens)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Geen geldige profiel-URL (geen YADIS-document)."
+
+#: 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 "Het was niet mogelijk een verzoektoken te krijgen."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Mededelingenfeed voor %s (RSS 1.0)"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Mededelingenfeed voor %s (RSS 2.0)"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Mededelingenfeed voor %s (Atom)"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Updates van %1$s op %2$s."
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed voor vrienden van %s (RSS 1.0)"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed voor vrienden van %s (RSS 2.0)"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed voor vrienden van %s (Atom)"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Vriend van een vriend (FOAF) voor %s"
+
+#: actions/shownotice.php:90
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Maak een nieuw account aan"
+msgid "Notice deleted."
+msgstr "De mededeling is verzonden"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Kon e-mail niet bevestigen."
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Deze pagina is niet beschikbaar in een "
 
-#~ msgid "Email address"
-#~ msgstr "E-mailadres"
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Mededelingenfeed voor label %s (RSS 1.0)"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Fout bij toevoegen bericht"
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Controleer de details alstublieft om er zeker van te zijn u zich wilt "
+"abonneren op de mededelingen van deze gebruiker. Als u zojuist geen verzoek "
+"hebt gedaan om te abonneren op de mededelingen van een andere gebruiker, "
+"klik dan op \"Afkeuren\""
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"Het abonnement is geautoriseerd maar er is geen callback-URL doorgegeven. "
+"Controleer de instructies van de website voor details over hoe het "
+"abonnement te autoriseren."
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Het abonnement is afgewezen maar er is geen callback-URL doorgegeven. "
+"Controleer de instructies van de website voor details over hoe het "
+"abonnement volledig af te wijzen."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Het was niet mogelijk de avatar-URL \"%s\" te lezen."
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Het beelbestandstype voor \"'%s\" is onjuist"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Het was niet mogelijk om door te verwijzen naar de server: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Licentie van de StatusNet-software"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr ""
+"Het was niet mogelijk het bevestigde e-mailadres voor de gebruiker bij te "
+"werken."
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "Als je je wachtwoord vergeten of kwijt bent, kan een nieuw wachtwoord "
-#~ "worden opgestuurd naar het e-mailadres dat je in je account hebt "
-#~ "vastgelegd."
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "De por is verzonden"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Op deze mededeling antwoorden"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Geen bevestigingscode."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Bij de site aanmelden"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Selecteer een provider"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Beschrijf de groep of het onderwerp in maximaal 140 karakters"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Beschrijf de groep of het onderwerp in maximaal 140 karakters"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Geen mededelings-ID"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%1$s heeft zojuist uw kennisgeving van %2$s toevoegd"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " van "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Het was niet mogelijk de brongebruiker te bepalen."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Mededeling verwijderen"
diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo
index 7dbde4019..a5727e1f6 100644
--- a/locale/nn/LC_MESSAGES/statusnet.mo
+++ b/locale/nn/LC_MESSAGES/statusnet.mo
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 4da276adb..0c9f7d7f4 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -1,28 +1,29 @@
-# nn_NO translation of StatusNet.
-#
+# Translation of StatusNet to Norwegian Nynorsk
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: StatusNet 0.6.3\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-16 18:52+0000\n"
-"Last-Translator: Simon Hansen <simonboba@gmail.com>\n"
-"Language-Team: Norwegian/Nynorsk <i18n-nn@lister.ping.uio.no>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:10+0000\n"
+"Language-Team: Norwegian Nynorsk\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nn\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Søkestraum for «%s»"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -35,17 +36,19 @@ msgid " from "
 msgstr " frå "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Oppdateringar som svarar til %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s har invitert deg til %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -98,6 +101,7 @@ msgstr ""
 "Beste helsing, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s høyrer no på notisane dine på %2$s."
@@ -120,25 +124,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s sin status på %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s offentlege straum"
@@ -148,34 +155,48 @@ msgstr "%s offentlege straum"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s med vener"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s offentleg tidsline"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidsline"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s oppdateringar frå alle saman!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -183,7 +204,8 @@ msgstr ""
 "(Du mottek ein epost med instruksjonar på korleis du stadfester epostadressa "
 "di)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -192,7 +214,8 @@ msgstr ""
 "**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site."
 "broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** er ei mikrobloggingteneste. "
@@ -204,33 +227,37 @@ msgstr ". Bidrag skal verta fylgd av fullt namn eller kallenamn."
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom. "
 "Kravd."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 eller fleire teikn"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 eller fleire teikn, og ikkje gløym dei."
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 eller fleire teikn. Kravd."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -240,6 +267,7 @@ msgstr ""
 "for å senda meldinger til deg."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -273,7 +301,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Fann ikkje API-metode."
 
@@ -296,16 +351,23 @@ msgstr "Fann ikkje API-metode."
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "API-metoden er ikkje ferdig enno."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Om"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Godta"
 
@@ -316,6 +378,9 @@ msgstr "Godta"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Legg til"
 
@@ -333,27 +398,29 @@ msgstr "Legg/fjern OpenID-er"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Adresse"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Venene sine adresser for invitasjon (ei per line)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Alle tingingar"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Alle oppdateringar for %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Alle oppdateringer frå søket «%s»"
@@ -363,30 +430,37 @@ msgstr "Alle oppdateringer frå søket «%s»"
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Allereie logga inn."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Allereie tinga!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Sikker på at du vil sletta notisen?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autoriser tinging"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -395,15 +469,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Brukarbilete"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Lasta opp brukarbilete."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -413,6 +491,7 @@ msgstr ""
 "instruksjonar (la du %s til venelista di?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -421,7 +500,7 @@ msgstr ""
 "med instruksjonar."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Ventar på godkjenning for dette telefonnummeret."
 
@@ -432,6 +511,8 @@ msgstr "Før »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Om meg"
 
@@ -439,16 +520,18 @@ msgstr "Om meg"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "«Om meg» er for lang (maks 140 "
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Kan ikkje sletta notisen."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Kan ikkje lesa brukarbilete-URL «%s»"
@@ -456,6 +539,8 @@ msgstr "Kan ikkje lesa brukarbilete-URL «%s»"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Klarar ikkje lagra nytt passord."
 
@@ -463,31 +548,34 @@ msgstr "Klarar ikkje lagra nytt passord."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Klarte ikkje laga OpenID-objekt."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Klarar ikkje normalisera Jabber-IDen"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Klarar ikkje normalisera epostadressa"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Endra"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Endra eposthandtering"
 
@@ -497,11 +585,12 @@ msgid "Change password"
 msgstr "Endra passord"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Endra passordet ditt"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Endra profilinnstillingane dine"
 
@@ -511,6 +600,9 @@ msgstr "Endra profilinnstillingane dine"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Godta"
 
@@ -523,12 +615,14 @@ msgstr "Stadfest adresse"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Stadfesting avbrutt."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Stadfestingskode"
 
@@ -537,7 +631,8 @@ msgstr "Stadfestingskode"
 msgid "Confirmation code not found."
 msgstr "Fann ikkje stadfestingskode."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -570,20 +665,24 @@ msgstr ""
 "Takk for at du blei med, og vi håpar du vil lika tenesta!"
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Kopla til"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Kopla til eksisterande konto"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Kunne ikkje laga OpenID-form: %s"
@@ -591,35 +690,39 @@ msgstr "Kunne ikkje laga OpenID-form: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kan ikkje fylgja brukar: %s er allereie på lista di."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Fann ikkje brukaren, so han kan ikkje fylgjast"
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Klarte ikkje å omdirigera til tenaren: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Kan ikkje lagra brukarbilete-informasjon"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Kan ikkje lagra ny profilinfo"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Kan ikkje tinga andre til deg."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Kan ikkje tinga."
 
@@ -639,15 +742,17 @@ msgstr "Kan ikkje konvertera spyrjebillett til tilgongsbillett."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Kan ikkje sletta tinging."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Kan ikkje finna einkvan status."
 
@@ -660,29 +765,38 @@ msgstr "Fekk ikkje spørjingsbillett (request token)."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Kan ikkje leggja til godkjenningskode."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Kan ikkje leggja til ny tinging."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Kan ikkje lagra profil."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Kan ikkje oppdatera brukar for automatisk tinging."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Kan ikkje oppdatera brukarinformajon."
 
@@ -698,42 +812,48 @@ msgstr "Kan ikkje oppdatera brukarinformajon."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Kan ikkje oppdatera brukar."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Lag"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Lag ei ny brukar med dette kallenamnet."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Opprett ny konto"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Oppretter ny konto for OpenID som allereie har ein brukar."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Stadfesta Jabber/Gtalk-adresse."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Godkjent mobiltelefonnummer."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Godkjent epostadresse."
 
@@ -742,23 +862,27 @@ msgid "Currently"
 msgstr "Noverande"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Databasefeil, kan ikkje lagra svar: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Slett notis"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Skriv om deg og interessene dine med 140 teikn"
 
@@ -766,11 +890,13 @@ msgstr "Skriv om deg og interessene dine med 140 teikn"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Epost"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Epostadresse"
 
@@ -780,39 +906,43 @@ msgid "Email Settings"
 msgstr "Epostinnstillingar"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Epostadressa finst allereie."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Stadfesting av epostadresse"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Epostadresse («brukarnamn@example.org»)"
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Epostadresser"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Skriv inn kallenamn eller epostadresse."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Skriv inn koden du fekk på telefonen."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Feil ved godkjenning av billett."
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Feil ved kopling av brukar til OpenID."
 
@@ -823,39 +953,46 @@ msgstr "Feil ved å kopla til brukar."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Feil med innhenting av brukarbilete."
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Feil med å henta inn ny profil"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Feil med å henta inn ekstern profil"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Feil med lagring av adressestadfesting."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Feil med lagring av ekstern profil"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Feil ved lagring av profil"
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Feil ved lagring av brukar"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Feil ved lagring av brukar; fungerer ikkje."
 
@@ -864,6 +1001,9 @@ msgstr "Feil ved lagring av brukar; fungerer ikkje."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Feil ved å setja brukar."
 
@@ -874,6 +1014,7 @@ msgstr "Feil ved oppdatering av profil"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Feil ved oppdatering av ekstern profil"
 
@@ -883,33 +1024,36 @@ msgid "Error with confirmation code."
 msgstr "Feil med stadfestingskode."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Kallenamnet eksisterer"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "OSS"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Feil ved oppdatering av brukarbilete."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Straum for vener av %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Straum for svar til %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Straum for merkelapp %s"
@@ -924,7 +1068,7 @@ msgstr "Søk i innhaldet av notisar"
 msgid "Find people on this site"
 msgstr "Finn folk på denne sida"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -937,6 +1081,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Fullt namn"
 
@@ -945,23 +1094,33 @@ msgstr "Fullt namn"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Hjelp"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Heim"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Heimeside"
 
@@ -969,21 +1128,27 @@ msgstr "Heimeside"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Eg vil senda notisar med epost."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "Ljonmelding"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Ljonmeldingadresse"
 
@@ -993,7 +1158,7 @@ msgid "IM Settings"
 msgstr "Ljonmeldinginnstillingar"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1001,7 +1166,7 @@ msgstr ""
 "Logg inn med brukarnanm/passord for å kopla brukaren til OpenID-en, viss du "
 "allereie har ein brukar"
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1009,7 +1174,7 @@ msgstr ""
 "Skriv OpenID-en din i boksen nedanfor og trykk «Legg til» om du ynskjer å "
 "leggja han til."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1020,25 +1185,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Innkomande epost"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Fjerna innkomande epostadresse."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Det gamle passordet stemmer ikkje"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Feil brukarnamn eller passord"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1047,30 +1218,31 @@ msgstr ""
 "lagra i kontoen din."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Ugyldig brukarbilete-nettadresse «%s»"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Ugyldig epostadresse: «%s»"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ugyldig heimeside «%s»"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ugyldig lisens-netadresse «%s»"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Ugyldig notisinnhald"
 
@@ -1085,13 +1257,13 @@ msgid "Invalid notice url"
 msgstr "Ugyldig notis-adresse"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Ugyldig profil-nettadresse «%s»"
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "Ugyldig profil-nettadresse (feil format)"
 
@@ -1109,44 +1281,52 @@ msgstr "Ugyldig storleik."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ugyldig brukarnamn eller passord."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Invitasjon(er) sendt"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Invitasjon(er) sendt til fylgjande folk:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Invitér"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Invitér nye brukarar"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 ""
-"Den køyrer [StatusNet](http://status.net) mikroblogging-programvare, versjon %"
-"s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+"Den køyrer [StatusNet](http://status.net) mikroblogging-programvare, versjon "
+"%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-ID tilhøyrer allereie ein annan brukar."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1156,12 +1336,14 @@ msgstr ""
 "leggja %s til venelista di i ljonmeldingsklienten din."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Språk"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Språk er for langt (maksimalt 50 teikn)."
 
@@ -1170,7 +1352,15 @@ msgstr "Språk er for langt (maksimalt 50 teikn)."
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Plassering"
 
@@ -1179,7 +1369,12 @@ msgstr "Plassering"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
@@ -1188,18 +1383,22 @@ msgstr "Plassering er for lang (maksimalt 255 teikn)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Logg inn"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Logg inn med ein [OpenID](%%doc.openid%%)-konto."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1210,22 +1409,26 @@ msgstr ""
 "%action.register%%) ein ny konto, eller prøv [OpenID](%%action.openidlogin%"
 "%)."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Logg ut"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Mista eller gløymd passord?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Vel ny epostadresse til å oppdatera med; fjerner den gamle."
 
@@ -1236,16 +1439,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Styr korleis du får epost frå %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Medlem sidan"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Mikroblogg av %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1257,42 +1462,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Teksten og filene mine er tilgjengeleg under "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Ny"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Ny epostadresse for å oppdatera %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "La til ny innkomande epostadresse."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Nytt kallenamn"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Ny notis"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nytt passord"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "Lagra det nye passordet. Du er logga inn."
 
@@ -1302,7 +1515,13 @@ msgstr "Lagra det nye passordet. Du er logga inn."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Kallenamn"
 
@@ -1311,7 +1530,12 @@ msgstr "Kallenamn"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 
@@ -1320,47 +1544,58 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Kallenamnet er ikkje gyldig."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Kallenamnet til brukaren du vil fylgja"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Kallenamn eller epostadresse"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "Nei"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Nei Jabber-ID"
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Ingen autoriserings-spørjing!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Ingen mobiloperatør vald."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Ingen innskriven kode"
 
@@ -1372,11 +1607,15 @@ msgstr "Ingen stadfestingskode."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Ingen innhald."
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Ingen epostadresse."
 
@@ -1385,7 +1624,9 @@ msgid "No id."
 msgstr "Ingen ID."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "Ingen innkomande epostadresse."
 
@@ -1396,6 +1637,7 @@ msgstr "Ingen kallenamn gjeve av den eksterne tenaren."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Ingen kallenamn."
 
@@ -1403,12 +1645,14 @@ msgstr "Ingen kallenamn."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventande stadfesting å avbryta."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Ingen telefonnummer."
 
@@ -1418,7 +1662,8 @@ msgid "No profile URL returned by server."
 msgstr "Ingen profil-nettadresse returnert av tenar."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Ingen registrert epostadresse for den brukaren."
 
@@ -1430,7 +1675,7 @@ msgstr "Fann inga spørjing."
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Ingen resultat"
 
@@ -1441,12 +1686,16 @@ msgstr "Ingen storleik."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Fann ingen status med den ID-en."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Fann ingen status med den ID-en."
 
@@ -1456,13 +1705,15 @@ msgid "No such OpenID."
 msgstr "Fann ingen slik OpenID."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Slikt dokument finst ikkje."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Denne notisen finst ikkje."
 
@@ -1500,12 +1751,22 @@ msgstr "Tinginga finst ikkje."
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Brukaren finst ikkje."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "Ingen brukar med den epostadressa eller det brukarnamnet."
 
@@ -1519,32 +1780,38 @@ msgid "Not a recovery code."
 msgstr "Ikkje ei gjenopprettingskode."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Ikkje ein registrert brukar."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Ikkje eit støtta dataformat."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Ikkje ein gyldig Jabber-ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Ikkje ein gyldig OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Ikkje ei gyldig epostadresse"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Ikkje ei gyldig epostadresse."
 
@@ -1552,6 +1819,11 @@ msgstr "Ikkje ei gyldig epostadresse."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Ikkje eit gyldig brukarnamn."
 
@@ -1571,7 +1843,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Ikkje ein brukande profil-netadresse (ingen YADIS-dokument)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Korrupt bilete."
 
@@ -1582,11 +1855,13 @@ msgstr "Ikkje autorisert."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Venta ikkje dette svaret!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Fann ikkje"
 
@@ -1602,11 +1877,15 @@ msgstr "Fann ikkje"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Ikkje logga inn"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Ikkje tinga."
 
@@ -1623,39 +1902,44 @@ msgid "Notice feed for %s"
 msgstr "Notisstraum for %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Notisen har ingen profil"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Notisar"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notisar merka med %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Gamalt passord"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "OpenID kontooppsett"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "OpenID auto-innsending"
 
@@ -1663,29 +1947,34 @@ msgstr "OpenID auto-innsending"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "OpenID-adresse"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID-adresse"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "OpenID-påkopling avbrutt."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID-innlogging gjekk dunken: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID-feil: %s"
@@ -1701,11 +1990,12 @@ msgid "OpenID settings"
 msgstr "OpenID-innstillingar"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Eventuelt legg til ei personleg melding til invitasjonen."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Hallvegs opplasta."
 
@@ -1715,34 +2005,46 @@ msgstr "Hallvegs opplasta."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Passord"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Passord og stadfesting stemmer ikkje."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Passord må vera 6 tekn eller meir."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Passord opphenting etterspurt"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Lagra passord."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Passorda var ikkje like."
 
@@ -1762,14 +2064,17 @@ msgid "People search"
 msgstr "Søk etter folk"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Personleg"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Personleg melding"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonnummer, kun tall, med landskode"
 
@@ -1783,7 +2088,7 @@ msgstr ""
 "brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\""
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Legg til ein notis når min Jabber/GTalk status forandrar seg."
 
@@ -1792,7 +2097,9 @@ msgstr "Legg til ein notis når min Jabber/GTalk status forandrar seg."
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Brukarval"
 
@@ -1801,42 +2108,52 @@ msgstr "Brukarval"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Lagra brukarval."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Foretrukke språk"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Personvern"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Eit problem oppstod ved lagring av notis."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profil"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "Profil-adresse"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profilinnstillingar"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Ukjend profil"
 
@@ -1845,17 +2162,19 @@ msgid "Public Stream Feed"
 msgstr "Offentleg straum"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Offentleg tidsline"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser ein MicroID for epost addressa mi."
 
@@ -1865,12 +2184,14 @@ msgid "Recent Tags"
 msgstr "Nylege merkelappar"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Gjenopprett"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Hent fram passord"
 
@@ -1883,37 +2204,45 @@ msgstr "Hent fram passord for ukjend brukar."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrér"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Registrering ikkje tillatt."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Registreringa gikk bra"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Avslå"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Hugs meg"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Ekstern profil med ingen passande profil"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Eksternt abbonement"
 
@@ -1927,6 +2256,9 @@ msgstr "Eksternt abbonement"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1935,7 +2267,7 @@ msgstr "Fjern"
 msgid "Remove OpenID"
 msgstr "Fjern OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1944,34 +2276,41 @@ msgstr ""
 "du treng å fjerne den, legg til ein annan OpenID først."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Svar"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Svar til %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Avbryt"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Tilbakestill passord"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "SMS telefon nummer"
 
@@ -1980,17 +2319,18 @@ msgstr "SMS telefon nummer"
 msgid "SMS Settings"
 msgstr "SMS innstillingar"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "SMS bekreftelse"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Samme passord som over"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Samme som passord over. PÃ¥krevd."
 
@@ -2003,12 +2343,21 @@ msgstr "Samme som passord over. PÃ¥krevd."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Lagra"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Søk"
 
@@ -2018,7 +2367,7 @@ msgid "Search Stream Feed"
 msgstr "Søk i straum"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2027,7 +2376,7 @@ msgstr ""
 "Søk i notisar på %%site.name%% i innhald. Separer nøkkelord med mellomrom; "
 "dei må være minimum 3 bokstavar eller meir."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2037,33 +2386,38 @@ msgstr ""
 "nøkkelord med mellomrom; dei må være minimum 3 bokstavar eller meir."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Velg ein tilbydar"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Send"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Send epost til denne addressa for å legge til nye notisar."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send meg ein notis ved nye tingingar på epost."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send meg ein notis via Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2072,15 +2426,18 @@ msgstr ""
 "min tilbydar."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "Send meg svar via Jabber/GTalk fra folk eg ikkje abbonnerar på."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Innstillingar"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Lagra innstillingar."
 
@@ -2100,27 +2457,32 @@ msgid "Something weird happened."
 msgstr "Noko rart skjedde."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Beklager, inngåande epost er ikkje tillatt."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Beklager, det er ikkje di inngåande epost addresse."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Kjeldekode"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Statistikk"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Fann ikkje lagra OpenID"
 
@@ -2128,24 +2490,28 @@ msgstr "Fann ikkje lagra OpenID"
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Ting"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Tingarar"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Tinging autorisert"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Tinging avvist"
 
@@ -2153,28 +2519,35 @@ msgstr "Tinging avvist"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Tingingar"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Systemfeil ved opplasting av fil."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Merkelappar"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Tekst"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Tekstsøk"
 
@@ -2194,6 +2567,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Den godkjenningskoden er ikkje for deg!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Den epost addressa er alt registrert hos ein annan brukar."
 
@@ -2203,63 +2577,73 @@ msgid "That file is too big."
 msgstr "Fila er for stor."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Det er alt din Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Det er alt din epost addresse"
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Det er alt ditt telefonnummer"
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Det er ikkje din Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Det er ikkje din epost addresse."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Det er ikkje ditt telefonnummer"
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Det er feil lynmeldings addresse."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Det er feil godkjennings nummer."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Det telefonnummeret er alt registrert hos ein annan brukar."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Det er for langt! Ein notis kan berre innehalde 255 teikn."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Addressa \"%s\" har blitt bekrefta for din konto."
@@ -2268,11 +2652,14 @@ msgstr "Addressa \"%s\" har blitt bekrefta for din konto."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "Addressa blei fjerna."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2282,7 +2669,8 @@ msgstr ""
 "Sjekk med sida sine instruksjonar for korleis autorisering til tinginga skal "
 "gjennomførast. Ditt tingings teikn er: "
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2292,34 +2680,39 @@ msgstr ""
 "med sida sine instruksjonar for korleis ein skal avvise tinginga."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Dette er folk som lyttar til %s's notisar"
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Dette er folk som lyttar til dine notisar."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Dette er folka som %s tingar oppdateringar frå."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Dette er dei du lyttar til."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Desse er alt brukarar og du var automatisk satt opp med tinging på dei:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Denne godkjenningskoden er for gammal. Vennligst start på nytt."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2328,7 +2721,7 @@ msgstr ""
 "kann du klikka på knappen for å gå til OpenID-tilbydaren din."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2343,6 +2736,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Dette krev anten ein POST eller DELETE."
 
@@ -2351,49 +2747,64 @@ msgstr "Dette krev anten ein POST eller DELETE."
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Dette krev ein POST."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Tidssone"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Tidssone er ikkje valt."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: 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 ""
-"For å tinga kann du [logga inn](%%action.login%%), eller "
-"[registrera](%%action.register%%) ein ny konto.  Um du allereie hev ein "
-"konto på ei [kompatibel mikrobloggingside](%%doc.openmublog%%), kann du "
-"oppgje URLen til profilen under."
+"For å tinga kann du [logga inn](%%action.login%%), eller [registrera](%%"
+"action.register%%) ein ny konto.  Um du allereie hev ein konto på ei "
+"[kompatibel mikrobloggingside](%%doc.openmublog%%), kann du oppgje URLen til "
+"profilen under."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "To brukar IDer eller kallenamn er naudsynte."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
 
@@ -2405,15 +2816,22 @@ msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Uventa skjemasending."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Uventa passordnullstilling."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Uventa handling."
 
@@ -2444,38 +2862,47 @@ msgstr "Fjern tinging"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Støttar ikkje OMB-versjonen"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Støttar ikkje bileteformatet."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Oppdateringar over SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Oppdateringar over direktemeldingar (IM)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Oppdateringar frå %1$s og vener på %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Last opp"
 
@@ -2496,6 +2923,7 @@ msgid "Upload a new profile image"
 msgstr "Last opp eit nytt profilbilete"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -2503,7 +2931,9 @@ msgstr ""
 "tenesta."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord"
@@ -2528,11 +2958,16 @@ msgstr "Brukaren du lyttar til eksisterer ikkje."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Brukaren har inga profil."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Brukaren sitt kallenamn"
 
@@ -2541,29 +2976,33 @@ msgid "User not found."
 msgstr "Fant ikkje brukaren."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "Kva tidssone er du vanlegvis i?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Kva skjer, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Feil biletetype for '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Feil storleik på biletet, på '%s'"
@@ -2571,7 +3010,9 @@ msgstr "Feil storleik på biletet, på '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Jau"
 
@@ -2594,11 +3035,12 @@ msgid "You are already logged in!"
 msgstr "Du er allereie logga inn!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Du tingar allereie oppdatering frå desse brukarane:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "Du er ikkje ven med brukaren."
 
@@ -2616,7 +3058,7 @@ msgstr "Du kan laga ein ny konto og byrja skriva meldingar."
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan motta SMS-meldingar gjennom e-post frå %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
@@ -2625,15 +3067,17 @@ msgstr ""
 "«Fjern»."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"Du kan sende og motta meldingar gjennom Jabber/GTalk "
-"[direktemeldingar](%%doc.im%%).  Set opp adressa og innstillingar under."
+"Du kan sende og motta meldingar gjennom Jabber/GTalk [direktemeldingar](%%"
+"doc.im%%).  Set opp adressa og innstillingar under."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2644,21 +3088,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Du kan nytta det lokale abonnementet!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Du sende oss ikkje den profilen"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2679,16 +3125,19 @@ msgstr ""
 "Helsing frå %4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Du kan ikkje sletta statusen til ein annan brukar."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "Du må verta logga inn for å invitera andre brukarar til %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2696,20 +3145,21 @@ msgstr ""
 "Du vil få ein notis når dei du har invitert har akseptert invitasjonen og "
 "har registrert seg på sida. Takk for å bidra til fellesskapet her!"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Du har blitt identifisert. Skriv inn eit nytt passord under her."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "Din OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Ditt kallenamn på denne servere, eller din registrerte epost addresse."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2718,47 +3168,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) lar deg logge inn på mangen sider med den samme "
 "brukar kontoen. Velikehold dine OpenID herfra."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "eit par sekund sidan"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "~%d dagar sidan"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "~%d timar sidan"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "~%d minutt sidan"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "~%d månadar sidan"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "omtrent ein dag sidan"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "omtrent eitt minutt sidan"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "omtrent ein månad sidan"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "omtrent eitt år sidan"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "omtrent ein time sidan"
 
@@ -2780,12 +3240,14 @@ msgid "reply"
 msgstr "svar"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "same passord som ovanfor"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "ikkje støtta fil type"
 
@@ -2806,6 +3268,26 @@ msgstr "« Etter"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
 
@@ -2814,6 +3296,7 @@ msgid "This notice is not a favorite!"
 msgstr "Denne notisen er ikkje ein favoritt!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Kunne ikkje slette favoritt."
 
@@ -2821,22 +3304,29 @@ msgstr "Kunne ikkje slette favoritt."
 msgid "Favor"
 msgstr "Tjeneste"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Send meg ein epost når nokon legg til ein av mine notisar som favoritt."
+msgstr ""
+"Send meg ein epost når nokon legg til ein av mine notisar som favoritt."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Send meg ein epost når nokon sender meg ei privat melding."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Denne notisen er alt ein favoritt!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Kunne ikkje lagre favoritt."
 
@@ -2846,11 +3336,13 @@ msgstr "Fjern favoritt"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s sine favorittar"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Favoritt straum for %s"
@@ -2892,23 +3384,32 @@ msgid "Login with your username and password. "
 msgstr "Logg inn med ditt brukarnamn og passord."
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Det er for langt. Ein notis kan berre være 140 teikn."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Ingen mottakar spesifisert."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Du kan ikkje sende melding til denne brukaren."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2916,11 +3417,13 @@ msgstr ""
 "fredleg."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "Ingen slik brukar"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Ny melding"
 
@@ -2975,6 +3478,11 @@ msgstr "Du kan oppdatere din personlege profil her"
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Kan ikkje finne brukar"
 
@@ -3003,6 +3511,8 @@ msgid "New password successfully saved. "
 msgstr "Nytt passord lagra."
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Passord må være minst 6 teikn."
 
@@ -3025,12 +3535,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "For å tinga må du [logga inn](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Straum for %s sine favorittar"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Kunne ikkje hente fram favorittane."
 
@@ -3038,7 +3551,7 @@ msgstr "Kunne ikkje hente fram favorittane."
 msgid "No such message."
 msgstr "Kan ikkje finne den meldinga."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Kun sendaren og mottakaren kan lese denne meldinga."
 
@@ -3062,51 +3575,70 @@ msgid "Mobile carrier for your phone. "
 msgstr "Tenestetilbydar for telefonen din."
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direkte meldingar til %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alle direkte meldingar sendt til %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Alle direkte meldingar du har sendt"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Alle direkte meldingar sendt fra %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Inga meldingstekst!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Kunne ikkje finne mottakar."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favorittar frå %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s oppdateringar favorisert av %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s la til di melding som ein favoritt"
@@ -3129,14 +3661,17 @@ msgstr ""
 "Twitter,"
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Twitter-innstillingar"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Twitterkonto"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Noverande verifisert Twitterkonto"
 
@@ -3145,6 +3680,7 @@ msgid "Twitter Username"
 msgstr "Brukarnamn på twitter"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Inga mellomrom."
 
@@ -3153,18 +3689,22 @@ msgid "Twitter Password"
 msgstr "Passord på Twitter"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Send mine notisar til Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Send lokale «@»-svar til Twitter."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Ting mine twitter-vener her."
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3173,6 +3713,7 @@ msgstr ""
 "Maksimalt 15 teikn."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "Twitter-informasjonen fungerer ikkje mot Twitter."
 
@@ -3183,33 +3724,43 @@ msgstr "Klarte ikkje å hente informasjon fra kontoen din, «%s», frå Twitter.
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Lagra Twitter-innstillingar."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Det er ikkje Twitter-kontoen din."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "Kunne ikkje fjerna Twitter-brukar."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Fjerna Twitter-brukar."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "Klarte ikkje å lagra Twitter-innstillingar."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Twitter-innstillingar lagra."
 
@@ -3226,18 +3777,19 @@ msgid "The subscription has been rejected, but no "
 msgstr "Abonnementet blei avslådd, men ingen"
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Resultat frå kommandoen"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Kommandoen utførd"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Kommandoen feila"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Orsak, men kommandoen er ikkje laga enno."
 
@@ -3247,89 +3799,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "Tingingar: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "Brukaren har ikkje siste notis"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Notis markert som favoritt."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt namn: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Stad: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Heimeside: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Direkte melding til %s sendt"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Ein feil oppstod ved sending av direkte melding."
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Spesifer namnet til brukaren du vil tinge"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Tingar %s"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Tingar ikkje %s lengre"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Kommando ikkje implementert."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Notifikasjon av."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "Kan ikkje skru av notifikasjon."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Notifikasjon på."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Kan ikkje slå på notifikasjon."
 
@@ -3337,11 +3911,11 @@ msgstr "Kan ikkje slå på notifikasjon."
 msgid "Commands:\n"
 msgstr "Komandoar:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "Kunne ikkje lagre melding."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "Kunne ikkje oppdatere melding med ny URI."
 
@@ -3358,7 +3932,7 @@ msgstr ""
 "Du har ei ny addresse å sende til på %1$s.\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "Ny privat melding fra %s"
@@ -3372,7 +3946,7 @@ msgstr ""
 "%1$s (%2$s) sendte deg ei privat melding: \n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "Kun brukaren kan lese sine eigne meldingar."
 
@@ -3381,31 +3955,39 @@ msgid "This form should automatically submit itself. "
 msgstr "Dette skjemaet vil automatisk bli sendt."
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Favorittar"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s's favoritt meldingar"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Brukar"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Innboks"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Dine innkomande meldinger"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Utboks"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Dine sende meldingar"
 
@@ -3418,14 +4000,19 @@ msgid "Twitter integration options"
 msgstr "Twitter integrerings-innstillingar"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "Til"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "Kunne ikkje prosessera melding."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s med vener, side %d"
@@ -3435,21 +4022,31 @@ msgid "You can upload your personal avatar."
 msgstr "Du kan laste opp ein personleg avatar."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Avatar-innstillingar"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Forhandsvis"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Skaler"
 
@@ -3466,34 +4063,43 @@ msgid "There was a problem with your session token. "
 msgstr "Der var eit problem med sesjonen."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Velg eit utvalg av bildet som vil blir din avatar."
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Fant ikkje igjen fil data."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "Mista fila vår."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "Ukjend fil type"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "Ingen vald profil."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "Fann ingen profil med den IDen."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Blokker brukaren"
 
@@ -3501,11 +4107,11 @@ msgstr "Blokker brukaren"
 msgid "Are you sure you want to block this user? "
 msgstr "Er du sikker på at du vil blokkera denne brukaren?"
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Du har allereie blokkert denne brukaren."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "Lagring av informasjon feila."
 
@@ -3522,38 +4128,56 @@ msgstr "Du er i ferd med å fjerne ein oppdatering for godt."
 msgid "Add to favorites"
 msgstr "Legg til i favorittar"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Rediger %s gruppa"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr "Innboks må være slått på for at grupper skal virke"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Du må være logga inn for å lage ei gruppe."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "Ingen kallenamn"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "Fann ikkje gruppa"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Du må være administrator for å redigere gruppa"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Bruk dette skjemaet for å redigere gruppa"
 
@@ -3562,14 +4186,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr "Kallenamn kann berre ha små bokstavar"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "skildringa er for lang (maks 140 teikn)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "Kann ikkje oppdatera gruppa."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "Lagra innstillingar."
 
@@ -3586,7 +4211,8 @@ msgstr "Lag ei ny e-postadresse for å posta til;"
 msgid "Send me email when someone "
 msgstr "Send meg ein epost når nokon "
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillat vennar å sende meg ein epost."
 
@@ -3598,7 +4224,7 @@ msgstr "Den e-postadressa er alt registrert hjå"
 msgid "A confirmation code was sent to the email address you added. "
 msgstr "Sendte konfirmasjonskode til e-postadresse du la til."
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "Server feil - kunne ikkje hente brukar!"
 
@@ -3612,51 +4238,66 @@ msgstr "Vist du ønskjer at %s applikasjon skal automatisk oppgradere"
 msgid "Allow %s to update my Facebook status"
 msgstr "Tillat %s å oppdatere min Facebook status"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Hopp over"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr "Ingen innhald."
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Paginering"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "« Etter"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "Før »"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Takk for at du inviterar vennane dine til å bruke %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "Invitasjon(er) sendt til fylgjande folk:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "Du har blitt invitert til %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr "Inviter venane dine til å nytta %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Vennar som alt brukar %s:"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Send invitasjonar"
@@ -3698,12 +4339,14 @@ msgstr "Vist du ønskjer at %s skal atuomatisk oppdatere"
 msgid "Sync preferences"
 msgstr "Synkronisering"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Fjern favoritt"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Populære notisar"
 
@@ -3717,7 +4360,8 @@ msgid "The most popular notices on the site right now."
 msgstr "Viser dei mest populære notisane på sida akkurat no."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Profilerte folk"
 
@@ -3731,15 +4375,17 @@ msgstr "Profilerte folk, side %d"
 msgid "A selection of some of the great users on %s"
 msgstr "Eit utval av nokre av dei flotte folka på %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "Ingen ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Logo åt gruppa"
 
@@ -3747,11 +4393,13 @@ msgstr "Logo åt gruppa"
 msgid "You can upload a logo image for your group."
 msgstr "Du kan lasta opp ein logo for gruppa."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Logo oppdatert."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "Feil ved oppdatering av logo."
 
@@ -3770,7 +4418,8 @@ msgid "A list of the users in this group."
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grupper"
 
@@ -3785,6 +4434,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "%%%%site.name%%%% grupper lar deg finne og snakke med"
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "Opprett ei ny gruppe"
 
@@ -3794,7 +4444,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr "Søk etter grupper på %%site.name%% etter namn, stad eller skildring."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Gruppesøk"
 
@@ -3816,20 +4466,20 @@ msgstr "Send meg svar på Jabber/GTalk."
 msgid "A confirmation code was sent "
 msgstr "Ein stadfestingskode vart sendt"
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "Du må være logga inn for å bli med i ei gruppe."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "Du er allereie medlem av den gruppa"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s blei medlem av gruppe %s"
@@ -3838,15 +4488,18 @@ msgstr "%s blei medlem av gruppe %s"
 msgid "Inboxes must be enabled for groups to work."
 msgstr "Innboks må være slått på for at grupper skal kunne fungere."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "Denne gruppa finst ikkje."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "Du er ikkje medlem av den gruppa."
 
@@ -3854,21 +4507,25 @@ msgstr "Du er ikkje medlem av den gruppa."
 msgid "You may not leave a group while you are its administrator."
 msgstr "Du kan ikkje melde deg ut av ei gruppe når du er administrator i den."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr "Kan ikkje finne brukar."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Kunne ikkje fjerne %s fra %s gruppa "
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s forlot %s gruppa"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "Logg inn "
 
@@ -3880,15 +4537,17 @@ msgstr "Ingen status"
 msgid "New group"
 msgstr "Ny gruppe"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "Kunne ikkje laga gruppa."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr "Kunne ikkje bli med i gruppa."
 
@@ -3900,11 +4559,14 @@ msgstr "Det er for langt."
 msgid "Don't send a message to yourself; "
 msgstr "Ikkje send melding til deg sjølv;"
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "Melding lagra"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Ajax feil"
 
@@ -3923,7 +4585,7 @@ msgstr "Dytta!"
 msgid "Nudge sent!"
 msgstr "Dytta!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr "OpenID-innlogging"
 
@@ -3947,11 +4609,13 @@ msgstr "URL forkorting"
 msgid "Service"
 msgstr "Teneste"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Den automatisk forkortingstenesta du vil bruke"
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)."
 
@@ -3959,16 +4623,17 @@ msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)."
 msgid "Change your password."
 msgstr "Endra passordet ditt"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr "Endra passord"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Ikkje gyldig merkelapp: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Brukarar sjølv-merka med %s, side %d"
@@ -3978,11 +4643,12 @@ msgstr "Brukarar sjølv-merka med %s, side %d"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Desse brukarane har merka seg sjølve med «%s»"
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profil informasjon"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -3994,20 +4660,25 @@ msgid "Automatically subscribe to whoever "
 msgstr "Automatisk tinging av alle som"
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ugyldig merkelapp: %s"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "Kan ikkje lagra merkelapp."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Offentleg tidsline, side %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Kan ikkje hente offentleg straum."
 
@@ -4017,8 +4688,8 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"Dette er %%site.name%%, ei [mikroblogging](http://en.wikipedia.org/wiki"
-"/Micro-blogging)-teneste"
+"Dette er %%site.name%%, ei [mikroblogging](http://en.wikipedia.org/wiki/"
+"Micro-blogging)-teneste"
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4029,11 +4700,13 @@ msgstr "Offentleg emne sky"
 msgid "These are most popular recent tags on %s "
 msgstr "Dei mest populære emna på %s"
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "Emne sky"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Beklage, men kun inviterte kan registrere seg."
 
@@ -4082,7 +4755,8 @@ msgstr "(Du skal få ein beskjed via epost )"
 msgid "That's a local profile! Login to subscribe."
 msgstr "Det er ikkje ein lokal profil! Log inn for å tinge."
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Svar til %s, side %d"
@@ -4092,50 +4766,71 @@ msgstr "Svar til %s, side %d"
 msgid "%s favorite notices, page %d"
 msgstr "%s favoritt meldingar, side %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s gruppe"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s gruppe, side %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Gruppe profil"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr "Merknad"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Gruppe handlingar"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr "Notisstraum for %s gruppa"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Medlemmar"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "Alle medlemmar"
 
@@ -4145,14 +4840,14 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** er ei brukargruppe på %%%%site.name%%%%, ei "
-"[mikroblogging](http://en.wikipedia.org/wiki/Micro-blogging)-teneste"
+"**%s** er ei brukargruppe på %%%%site.name%%%%, ei [mikroblogging](http://en."
+"wikipedia.org/wiki/Micro-blogging)-teneste"
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
 msgstr "Berre sendaren og mottakaren"
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, side %d"
@@ -4162,30 +4857,37 @@ msgid "'s profile"
 msgstr " sin profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "Brukarprofil"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Bilete"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "Brukarverkty"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "Send ei direktemelding til denne brukaren"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Melding"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "Tingarar"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "Alle gruppar"
 
@@ -4195,8 +4897,8 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** har ein konto på %%%%site.name%%%%, ei "
-"[mikroblogging](http://en.wikipedia.org/wiki/Micro-blogging)-teneste"
+"**%s** har ein konto på %%%%site.name%%%%, ei [mikroblogging](http://en."
+"wikipedia.org/wiki/Micro-blogging)-teneste"
 
 #: actions/smssettings.php:128
 msgid "Phone number, no punctuation or spaces, "
@@ -4210,7 +4912,7 @@ msgstr "Send meg notisar på SMS;"
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Ei stadfestingskode vart sendt til telefonnummeret du la til."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Telefontilbydar"
 
@@ -4268,16 +4970,17 @@ msgstr "Dette er dei du lyttar til."
 msgid "These are the people whose "
 msgstr "Dette er folk som"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Notisar merka med %s, side %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "Meldingar merka med «%s», dei siste fyrst"
@@ -4299,7 +5002,7 @@ msgstr "Merkelapp %s"
 msgid "Tag user"
 msgstr "Merk brukar"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4311,18 +5014,18 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "Det var eit problem med sesjons billetten din."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Du kan berre leggje til emneord på folk som du tingar notisar frå, eller som "
 "tingar notisar frå deg."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Kunne ikkje lagra emneord."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Bruk dette skjemaet for å leggje til emneord til dei som tingar notisar frå "
@@ -4332,20 +5035,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "Dette emneord finst ikkje."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "Mikroblogg merka med emneordet %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Blokkering av brukar feila."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "De-blokkering av brukar feila."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Finst ikkje."
 
@@ -4353,15 +5059,16 @@ msgstr "Finst ikkje."
 msgid "Add your Twitter account to automatically send "
 msgstr "Legg til Twitter-kontoen din for å automatisk sende"
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Brukarnamn hjå Twitter"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Passord hjå Twitter"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Vener på Twitter"
 
@@ -4374,144 +5081,153 @@ msgstr "Brukarnamn kan berre innehalde tal,"
 msgid "Unable to retrieve account information "
 msgstr "Klarte ikkje å hente informasjon om kontoen."
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "Feil ved fjerning av blokka."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "Ingen profil-ID i førespurnaden."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "Fann ingen profil med den IDen."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Fjerna tinging"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "%s grupper"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s grupper, side %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Feil ved lagring av notis.  Ukjend brukar."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Last opp ein avatar"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Anna"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Andre val"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Ingen tittel"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Navigasjon for hovudsida"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Personleg profil og oversyn over vener"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Søk etter folk eller innhald"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Konto"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Endra e-posten, avataren, passordet eller profilen"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Kopla til IM, SMS, Twitter"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Logg ut or sida"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Logg inn or sida"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Opprett ny konto"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "Logg inn med OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "Hjelp meg!"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr "Statusmelding"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "Lokale syningar"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr "Sidenotis"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Andrenivås side navigasjon"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "StatusNets programvarelisens"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "Alle"
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "lisens."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "Blokkér denne brukaren"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Blokkér"
 
@@ -4524,11 +5240,14 @@ msgstr "Fjern favoriseringsmerket"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "For å nytta %s Facebook-programmet må du logga inn"
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr "ein ny konto."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "Publisert"
 
@@ -4548,31 +5267,36 @@ msgstr "Filtrer emneord"
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Merkelapp"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Velg ein merkelapp for å begrense lista"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "GÃ¥"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Beskriving"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Beskriv gruppa eller emnet med 140 teikn"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»"
@@ -4581,20 +5305,20 @@ msgstr "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»"
 msgid "Group"
 msgstr "Gruppe"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "Administrator"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Rediger %s gruppa sine eigenskapar"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Legg til eller rediger logoen til %s"
@@ -4624,11 +5348,11 @@ msgstr "Bli med"
 msgid "Leave"
 msgstr "Forlat"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Log inn med brukarnamn og passord."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Opprett ny konto"
 
@@ -4650,17 +5374,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s høyrer no på"
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Stad: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Heimeside: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4669,7 +5393,7 @@ msgstr ""
 "Bio: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Du har blitt dulta av %s"
@@ -4684,39 +5408,47 @@ msgstr "%1$s (%2$s) lurer på kva du gjer på"
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s lyttar no til notisane dine på %2$s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "Frå"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Send ei direkte melding"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "Send ei melding"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Tilgjenglege teikn"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "som svar på"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Slett"
 
@@ -4737,27 +5469,29 @@ msgstr "Send eit dult til denne brukaren"
 msgid "Tags in %s's notices"
 msgstr "Merkelappar i %s sine notisar"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(ingen)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Offentleg"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Brukar grupper"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Nylege emneord"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Framheva"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Populære"
 
@@ -4773,31 +5507,33 @@ msgstr "Finn grupper på denne sida"
 msgid "Untitled section"
 msgstr "Seksjon utan tittel"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Mennesker %s tingar"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Mennesker som tingar %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupper %s er medlem av"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter vennar og kollega til å bli med deg på %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Brukar har blokkert deg."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Lagre tinging for brukar: %s"
 
@@ -4810,10 +5546,11 @@ msgid "Top posters"
 msgstr "Med flest meldingar"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "LÃ¥s opp brukaren"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "LÃ¥s opp"
 
@@ -4821,18 +5558,2058 @@ msgstr "LÃ¥s opp"
 msgid "Unsubscribe from this user"
 msgstr "Fjern tinging fra denne brukaren"
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Straum for vener av %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Straum for vener av %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Straum for vener av %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s med vener"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Du kan laste opp ein personleg avatar."
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Lasta opp brukarbilete."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Du er i ferd med å sletta ei melding.  Når den fyrst er sletta, kann du "
+"ikkje finne ho att."
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Send meg ein epost når nokon sender meg ei privat melding."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Du kan lasta opp ein logo for gruppa."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Velg eit utvalg av bildet som vil blir din avatar."
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Mikroblogg av %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Søk for mennesker på %%site.name%% i namn, lokasjon eller interesse. Separer "
+"nøkkelord med mellomrom; dei må være minimum 3 bokstavar eller meir."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Ein feil oppstod ved sending av direkte melding."
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Søkestraum for «%s»"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Skriv inn brukarnam og passord før du endrar innstillingar (av "
+"tryggleiksomsyn)."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Offentleg straum"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Offentleg straum"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Offentleg straum"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
+"telefonnummer."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Lag"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Gruppe profil"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr " sin profil"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Notisstraum for %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Notisstraum for %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Notisstraum for %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Utboks for %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Brukarbilete"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profilinnstillingar"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Sende godkjenningskode til telefonnummeret du la til. Sjekk innboksen for "
+"koden og veiledning på korleis du nyttar han."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Ingen slik brukar"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Legg til Twitter-kontoen din for å automatisk senda dine uppdateringar til "
+"Twitter,"
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Klarte ikkje å hente informasjon fra kontoen din, «%s», frå Twitter."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"Sjekk desse detaljane og forsikre deg om at du vil abonnere på denne "
+"brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\""
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Søk etter folk eller innhald"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Kopla til IM, SMS, Twitter"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Dult"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "For å nytta %s Facebook-programmet må du logga inn"
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s fylgjer no oppdateringane dine på %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Beste helsing,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Søk"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
 #, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "Kunne ikkje prosessera melding."
+msgid "No such attachment."
+msgstr "Slikt dokument finst ikkje."
 
+#: actions/block.php:149
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Opprett ny konto"
+msgid "Do not block this user from this group"
+msgstr "Ei liste over brukarane i denne gruppa."
 
+#: actions/block.php:150
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Sikker på at du vil sletta notisen?"
+msgid "Block this user from this group"
+msgstr "Ei liste over brukarane i denne gruppa."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Brukarprofil"
 
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s med vener, side %d"
+
+#: actions/blockedfromgroup.php:108
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Søk i innhaldet av notisar"
+msgid "A list of the users blocked from joining this group."
+msgstr "Ei liste over brukarane i denne gruppa."
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "De-blokkering av brukar feila."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Stadfestingskode"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Kan ikkje sletta notisen."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ugyldig merkelapp: %s"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Kunne ikkje lagre favoritt."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Ny notis"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Ny notis"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Ikkje eit gyldig brukarnamn."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Ingen vald profil."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Brukar har blokkert deg."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Du er ikkje medlem av den gruppa."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Blokker brukaren"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Du må være logga inn for å lage ei gruppe."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Grupper"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Kan ikkje oppdatera brukar."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Synkroniserings innstillingar blei lagra."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Du må være administrator for å redigere gruppa"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Administrator"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Ingen resultat"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Brukar har blokkert deg."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Melding"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Kan ikkje lagra profil."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) lar deg logge inn på mangen sider med den samme "
+"brukar kontoen. Velikehold dine OpenID herfra."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profilinnstillingar"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"Dette er %%site.name%%, ei [mikroblogging](http://en.wikipedia.org/wiki/"
+"Micro-blogging)-teneste"
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Me sender deg eit nytt passord til epostadressa i kontoen din viss du har "
+"mista det gamle."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Du har blitt identifisert. Skriv inn eit nytt passord under her."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Passord opphenting etterspurt"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Feil med stadfestingskode."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Lagre tinging for brukar: %s"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s favoritt meldingar, side %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Notisstraum for %s gruppa"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Notisstraum for %s gruppa"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Notisstraum for %s gruppa"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"**%s** er ei brukargruppe på %%%%site.name%%%%, ei [mikroblogging](http://en."
+"wikipedia.org/wiki/Micro-blogging)-teneste"
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Administrator"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Ikkje ein lokal brukar."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Notisar merka med %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Notisstraum for %s gruppa"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"**%s** har ein konto på %%%%site.name%%%%, ei [mikroblogging](http://en."
+"wikipedia.org/wiki/Micro-blogging)-teneste"
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s høyrer no på"
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Notisstraum for %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Notisstraum for %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Denne notisen er alt ein favoritt!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Denne notisen er ikkje ein favoritt!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Kan ikkje hente offentleg straum."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "Ingen mottakar spesifisert."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Kan ikkje finna einkvan status."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Oppdateringar som svarar til %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Oppdateringar frå %1$s på %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "lisens."
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s tingarar"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profilinnstillingar"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Du er ikkje medlem av den gruppa."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Eit problem oppstod ved lagring av notis."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Melding til %1$s på %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Brukarprofil"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profil"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Last opp"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Endra passordet ditt"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Kopla til"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Søk"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Logg inn"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Blokkér"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Blokker brukaren"
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Legg til eller rediger logoen til %s"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Ingen innhald."
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Brukar"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Søk"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Heimesida er ikkje ei gyldig internettadresse."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Dette emneord finst ikkje."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Direkte meldingar til %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Det er for langt. Ein notis kan berre være 140 teikn."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Fann ikkje brukaren, so han kan ikkje fylgjast"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "skildringa er for lang (maks 140 teikn)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Du er allereie medlem av den gruppa"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Du er ikkje medlem av den gruppa."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Kunne ikkje fjerne %s fra %s gruppa "
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s grupper"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Grupper %s er medlem av"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Gruppe handlingar"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Lasta opp brukarbilete."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Støttar ikkje bileteformatet."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Bilete"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "skildringa er for lang (maks 140 teikn)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Oppdateringar frå %1$s på %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Brukaren du lyttar til eksisterer ikkje."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Ikkje autorisert."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Kan ikkje konvertera spyrjebillett til tilgongsbillett."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Ukjend versjon av OMB-protokollen."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Denne notisen finst ikkje."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Mista fila vår."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Oppdateringar frå %1$s på %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Denne sida er ikkje tilgjengleg i eit"
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Logg inn med brukarnamn og passord. Har du ikkje brukarnamn endå? [Opprett](%"
+"%action.register%%) ein ny konto, eller prøv [OpenID](%%action.openidlogin%"
+"%)."
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Oppdateringar frå %1$s på %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Alle oppdateringer frå søket «%s»"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Kopla til"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Skriv om deg og interessene dine med 140 teikn"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Skildra deg sjølv og din"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "«Om meg» er for lang (maks 140 "
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Ikkje ein brukande profil-netadresse (ingen YADIS-dokument)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Det er ikkje ein lokal profil! Log inn for å tinge."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Fekk ikkje spørjingsbillett (request token)."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Notisstraum for %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Notisstraum for %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Notisstraum for %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Melding til %1$s på %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Straum for vener av %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Straum for vener av %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Straum for vener av %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Utboks for %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Melding lagra"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Denne sida er ikkje tilgjengleg i eit"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Notisstraum for %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Sjekk desse detaljane og forsikre deg om at du vil abonnere på denne "
+"brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\""
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"Tingina har blitt autorisert, men ingen henvisnings URL er tilgjengleg. "
+"Sjekk med sida sine instruksjonar for korleis autorisering til tinginga skal "
+"gjennomførast. Ditt tingings teikn er: "
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Tingina har blitt avvist, men ingen henvisnings URL er tilgjengleg. Sjekk "
+"med sida sine instruksjonar for korleis ein skal avvise tinginga."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Kan ikkje lesa brukarbilete-URL «%s»"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Feil biletetype for '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Klarte ikkje å omdirigera til tenaren: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNets programvarelisens"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Dytta!"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Svar på denne notisen"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Eit problem oppstod ved lagring av notis."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Ingen stadfestingskode."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Logg inn or sida"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Velg ein tilbydar"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Beskriv gruppa eller emnet med 140 teikn"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Beskriv gruppa eller emnet med 140 teikn"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Ny notis"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s la til di melding som ein favoritt"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " frå "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Kan ikkje hente offentleg straum."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Slett notis"
diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo
index dba116252..5e13dd9a7 100644
--- a/locale/pl/LC_MESSAGES/statusnet.mo
+++ b/locale/pl/LC_MESSAGES/statusnet.mo
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 54c52e949..3fbee78c8 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -1,27 +1,19 @@
-# translation of pl.po to Polish
-# Paweł Wilk <siefca@gnu.org>, 2008.
-# Piotr DrÄ…g <piotrdrag@gmail.com>, 2009.
-#
-# Polish language has 3 plural forms.
-# Special case is used for one and some numbers ending in 2, 3, or 4.
-# Example:
-# 1         WINDOW  -> 1 OKNO
-# x2 to x4  WINDOWS -> x2 do x4 OKNA (x != 1)
-# 5 or more WINDOWS -> 5 lub więcej OKIEN
+# Translation of StatusNet to Polish
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: pl\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-14 10:32-0700\n"
-"PO-Revision-Date: 2009-09-09 15:47+0200\n"
-"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:18+0000\n"
+"Language-Team: Polish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pl\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 #: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
@@ -50,12 +42,13 @@ msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s/aktualizacje odpowiadajÄ…ce na %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#: actions/invite.php:218 actions/invite.php:220
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s zapraszają Cię, abyś dołączył do nich w %2$s"
 
 #: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -137,20 +130,21 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
 #: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
-#: actions/twitapistatuses.php:328
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161 actions/shownotice.php:174
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Status użytkownika %1$s na %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#: actions/invite.php:125 actions/invite.php:133
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -170,14 +164,16 @@ msgstr "Publiczny strumień użytkownika %s"
 #: actions/facebookhome.php:163 actions/twitapistatuses.php:130
 #: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
 #: actions/facebookhome.php:158 actions/twitapistatuses.php:89
-#: lib/personalgroupnav.php:100
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "Użytkownik %s i przyjaciele"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
 #: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
-#: actions/twitapistatuses.php:37
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Publiczna oś czasu użytkownika %s"
@@ -190,19 +186,22 @@ msgstr "Status użytkownika %s"
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
 #: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
 #: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Oś czasu użytkownika %s"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
-#: actions/twitapistatuses.php:41
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Użytkownik %s aktualizuje od każdego!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -211,7 +210,7 @@ msgstr ""
 "potwierdzenia adresu e-mail)"
 
 #: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
-#: lib/action.php:752
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -221,7 +220,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
-#: lib/action.php:754
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** jest usługą mikroblogowania. "
@@ -235,33 +234,34 @@ msgstr ""
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
 #: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
-#: lib/groupeditform.php:154
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych"
 
 #: ../actions/register.php:152 actions/register.php:166
-#: actions/register.php:368 actions/register.php:414
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 lub więcej znaków"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 #: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 lub więcej znaków, i nie zapomnij go!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373 actions/register.php:419
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 lub więcej znaków. Wymagane."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
-#: actions/imsettings.php:321
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -271,7 +271,7 @@ msgstr ""
 "zaakceptować otrzymywanie wiadomości od %s."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-#: actions/emailsettings.php:350
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -320,7 +320,21 @@ msgstr ""
 #: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
 #: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
 #: actions/twitapistatuses.php:409 actions/twitapitags.php:110
-#: actions/twitapiusers.php:34
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Nie znaleziono metody API!"
 
@@ -353,12 +367,13 @@ msgid "API method under construction."
 msgstr "Metoda API jest w trakcie tworzenia."
 
 #: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
-#: lib/action.php:706
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "O usłudze"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 #: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Zaakceptuj"
 
@@ -370,6 +385,8 @@ msgstr "Zaakceptuj"
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
 #: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Dodaj"
 
@@ -387,12 +404,13 @@ msgstr "Dodaj lub usuń konta OpenID"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Adres"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-#: actions/invite.php:181 actions/invite.php:183
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Adresy przyjaciół, których zapraszasz (jeden na wiersz)"
 
@@ -419,6 +437,7 @@ msgstr "Wszystkie aktualizacje pasujÄ…ce do wyszukiwanego terminu \"%s\""
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
 #: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Jesteś już zalogowany."
 
@@ -428,23 +447,27 @@ msgstr "Już subskrybowane!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 #: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 #: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Upoważnij subskrypcję"
 
 #: ../actions/login.php:104 ../actions/register.php:178
 #: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
-#: actions/register.php:416 actions/register.php:463
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Automatyczne logowanie. Nie użyj na komputerach używanych przez wiele osób!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 #: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -455,7 +478,8 @@ msgstr ""
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
 #: actions/avatarsettings.php:67 actions/showgroup.php:211
-#: actions/showgroup.php:216
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Awatar"
 
@@ -465,7 +489,7 @@ msgid "Avatar updated."
 msgstr "Zaktualizowano awatar."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
-#: actions/imsettings.php:108
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -476,7 +500,7 @@ msgstr ""
 "znajomych?)."
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-#: actions/emailsettings.php:107
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -486,7 +510,7 @@ msgstr ""
 "instrukcjami."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Oczekiwanie na potwierdzenie tego numeru telefonu."
 
@@ -497,7 +521,8 @@ msgstr "Wcześniej »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
-#: actions/register.php:448
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "O mnie"
 
@@ -511,6 +536,7 @@ msgid "Bio is too long (max 140 chars)."
 msgstr "Wpis \"O mnie\" jest za długi (maksymalnie 140 znaków)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Nie można usunąć tego wpisu."
 
@@ -524,6 +550,7 @@ msgstr "Nie można odczytać adresu URL awatara \"%s\""
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Nie można zapisać nowego hasła."
 
@@ -531,7 +558,8 @@ msgstr "Nie można zapisać nowego hasła."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -541,22 +569,23 @@ msgid "Cannot instantiate OpenID consumer object."
 msgstr "Nie można utworzyć instancji obiektu klienta OpenID."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nie można znormalizować tego identyfikatora Jabbera"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 #: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Nie można znormalizować tego adresu e-mail"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Zmień"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Zmień obsługę adresu e-mail"
 
@@ -566,11 +595,12 @@ msgid "Change password"
 msgstr "Zmień hasło"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Zmień hasło"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Zmień ustawienia profilu"
 
@@ -581,6 +611,8 @@ msgstr "Zmień ustawienia profilu"
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
 #: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Potwierdź"
 
@@ -594,11 +626,13 @@ msgstr "Potwierdź adres"
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
 #: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Anulowano potwierdzenie."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Kod potwierdzajÄ…cy"
 
@@ -608,7 +642,7 @@ msgid "Confirmation code not found."
 msgstr "Nie znaleziono kodu potwierdzajÄ…cego."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -644,7 +678,7 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
 #: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
-#: lib/action.php:425
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Połącz"
 
@@ -654,7 +688,7 @@ msgid "Connect existing account"
 msgstr "Połącz z istniejącym kontem"
 
 #: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
-#: lib/action.php:719
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -668,12 +702,14 @@ msgstr "Nie można utworzyć formularza OpenID: %s"
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
 #: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Nie można obserwować użytkownika: %s jest już na Twojej liście."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
 #: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Nie można obserwować użytkownika: nie znaleziono użytkownika."
 
@@ -717,7 +753,8 @@ msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
-#: actions/emailsettings.php:382
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Nie można usunąć potwierdzenia adresu e-mail."
 
@@ -740,23 +777,26 @@ msgstr "Nie można uzyskać tokenu żądana."
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
 #: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Nie można wprowadzić kodu potwierdzającego."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Nie można wprowadzić nowej subskrypcji."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-#: actions/twitapiaccount.php:82
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Nie można zapisać profilu."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
 
@@ -766,6 +806,8 @@ msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
 #: actions/emailsettings.php:447 actions/emailsettings.php:469
 #: actions/smssettings.php:515 actions/smssettings.php:539
 #: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Nie można zaktualizować wpisu użytkownika."
 
@@ -783,7 +825,11 @@ msgstr "Nie można zaktualizować wpisu użytkownika."
 #: actions/profilesettings.php:259 actions/smssettings.php:266
 #: actions/smssettings.php:408 actions/emailsettings.php:287
 #: actions/emailsettings.php:418 actions/othersettings.php:167
-#: actions/profilesettings.php:260
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Nie można zaktualizować użytkownika."
 
@@ -810,17 +856,17 @@ msgstr ""
 "użytkownika."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Obecnie potwierdzone adresy Jabbera/GTalk."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Obecnie potwierdzone numery telefonów z włączoną usługą SMS."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Obecnie potwierdzone adresy e-mail."
 
@@ -829,19 +875,20 @@ msgid "Currently"
 msgstr "Obecnie"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#: classes/Notice.php:114 classes/Notice.php:124
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania znacznika hasha: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#: classes/Notice.php:757 classes/Notice.php:1042
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania odpowiedzi: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 #: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Usuń wpis"
 
@@ -856,12 +903,13 @@ msgstr "Opisz siÄ™ i swoje zainteresowania w 140 znakach"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
-#: actions/register.php:427 actions/register.php:431
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "E-mail"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Adres e-mail"
 
@@ -871,7 +919,7 @@ msgid "Email Settings"
 msgstr "Ustawienia adresu e-mail"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Adres e-mail już istnieje."
 
@@ -880,22 +928,23 @@ msgid "Email address confirmation"
 msgstr "Potwierdzenie adresu e-mail"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@przykład.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-#: actions/invite.php:179 actions/invite.php:181
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Adresy e-mail"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 #: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Podaj pseudonim lub adres e-mail."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Podaj kod, który otrzymałeś na telefonie."
 
@@ -917,21 +966,25 @@ msgstr "Błąd podczas łączenia użytkownika."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "BÅ‚Ä…d podczas wprowadzania awatara"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "BÅ‚Ä…d podczas wprowadzania nowego profilu"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "BÅ‚Ä…d podczas wprowadzania zdalnego profilu"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 #: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "BÅ‚Ä…d podczas zapisywania potwierdzenia adresu."
 
@@ -952,6 +1005,7 @@ msgstr "Błąd podczas zapisywanie użytkownika."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
 
@@ -961,7 +1015,8 @@ msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
 #: actions/login.php:120 actions/recoverpassword.php:372
-#: actions/register.php:235
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Błąd podczas ustawiania użytkownika."
 
@@ -972,6 +1027,7 @@ msgstr "BÅ‚Ä…d podczas aktualizowania profilu"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "BÅ‚Ä…d podczas aktualizowania zdalnego profilu"
 
@@ -986,7 +1042,7 @@ msgid "Existing nickname"
 msgstr "IstniejÄ…cy pseudonim"
 
 #: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
-#: lib/action.php:708
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -1025,7 +1081,7 @@ msgstr "Przeszukaj zawartość wpisów"
 msgid "Find people on this site"
 msgstr "Znajdź osoby na tej stronie"
 
-#: ../actions/login.php:122 actions/login.php:247
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1041,6 +1097,8 @@ msgstr ""
 #: actions/showgroup.php:237 actions/showstream.php:255
 #: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
 #: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "ImiÄ™ i nazwisko"
 
@@ -1052,17 +1110,21 @@ msgstr "ImiÄ™ i nazwisko"
 #: actions/updateprofile.php:97 actions/updateprofile.php:99
 #: actions/editgroup.php:197 actions/newgroup.php:147
 #: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 #: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Pomoc"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
 #: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Strona główna"
 
@@ -1070,7 +1132,8 @@ msgstr "Strona główna"
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
 #: lib/groupeditform.php:146 actions/register.php:442
-#: lib/groupeditform.php:161
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Strona domowa"
 
@@ -1080,21 +1143,25 @@ msgstr "Strona domowa"
 #: actions/profilesettings.php:199 actions/register.php:168
 #: actions/editgroup.php:194 actions/newgroup.php:144
 #: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Strona domowa nie jest prawidłowym adresem URL."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 #: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Chcę wysyłać wpisy przez e-mail."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "Komunikator"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Adres komunikatora"
 
@@ -1131,28 +1198,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Wiadomości przychodzące"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
 #: actions/emailsettings.php:443 actions/emailsettings.php:450
 #: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Usunięto przychodzący adres e-mail."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
 #: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Niepoprawne stare hasło"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
 #: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
-#: actions/facebookhome.php:129
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Niepoprawna nazwa użytkownika lub hasło."
 
 #: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
-#: actions/recoverpassword.php:322
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1185,7 +1255,7 @@ msgid "Invalid license URL '%s'"
 msgstr "Nieprawidłowy adres URL licencji \"%s\""
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Nieprawidłowa zawartość wpisu"
 
@@ -1206,7 +1276,7 @@ msgid "Invalid profile URL '%s'."
 msgstr "Nieprawidłowy adres URL profilu \"%s\"."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "Nieprawidłowy adres URL profilu (błędny format)"
 
@@ -1226,33 +1296,33 @@ msgstr "Nieprawidłowy rozmiar."
 #: actions/finishopenidlogin.php:279 actions/register.php:193
 #: actions/register.php:211 actions/finishopenidlogin.php:284
 #: actions/finishopenidlogin.php:307 actions/register.php:230
-#: actions/register.php:251
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-#: actions/invite.php:104
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Wysłano zaproszenia"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-#: actions/invite.php:138
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Wysłano zaproszenia do następujących osób:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
 #: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
-#: lib/facebookaction.php:221 lib/subgroupnav.php:105
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "ZaproÅ›"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-#: actions/invite.php:106
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Zaproś nowych użytkowników"
 
 #: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
-#: lib/action.php:756
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1264,12 +1334,12 @@ msgstr ""
 "Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Identyfikator Jabbera należy już do innego użytkownika."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
-#: actions/imsettings.php:120
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1281,11 +1351,13 @@ msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Język"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 #: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Język jest za długi (maksymalnie 50 znaków)."
 
@@ -1299,6 +1371,10 @@ msgstr "Język jest za długi (maksymalnie 50 znaków)."
 #: actions/register.php:454 actions/showgroup.php:251
 #: actions/showstream.php:229 actions/userauthorization.php:128
 #: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Położenie"
 
@@ -1310,6 +1386,9 @@ msgstr "Położenie"
 #: actions/updateprofile.php:112 actions/updateprofile.php:114
 #: actions/editgroup.php:203 actions/newgroup.php:153
 #: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
 
@@ -1321,7 +1400,8 @@ msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
 #: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
 #: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
 #: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
-#: lib/facebookaction.php:295 lib/facebookaction.php:321
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Zaloguj siÄ™"
@@ -1344,24 +1424,25 @@ msgstr ""
 "openidlogin%%). "
 
 #: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
-#: lib/action.php:435
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Wyloguj siÄ™"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393 actions/register.php:439
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" nazwisko"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
 #: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Zgubione lub zapomniane hasło?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
 #: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj stary."
 
@@ -1383,6 +1464,7 @@ msgid "Microblog by %s"
 msgstr "Mikroblog użytkownika %s"
 
 #: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1396,13 +1478,14 @@ msgstr ""
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
 #: actions/register.php:430 actions/finishopenidlogin.php:106
-#: actions/register.php:477
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Moje teksty i pliki są dostępne na "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Nowe"
 
@@ -1414,6 +1497,7 @@ msgstr "Nowy adres e-mail do wysyłania do %s"
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 #: actions/emailsettings.php:465 actions/emailsettings.php:472
 #: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "Dodano nowy przychodzÄ…cy adres e-mail."
 
@@ -1423,19 +1507,20 @@ msgid "New nickname"
 msgstr "Nowy pseudonim"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Nowy wpis"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-#: actions/recoverpassword.php:232
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nowe hasło"
 
 #: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
-#: actions/recoverpassword.php:379
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
 
@@ -1449,7 +1534,9 @@ msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
 #: actions/showgroup.php:226 actions/showstream.php:244
 #: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
 #: actions/showgroup.php:231 actions/showstream.php:209
-#: lib/facebookaction.php:314 lib/groupeditform.php:152
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Pseudonim"
 
@@ -1461,6 +1548,9 @@ msgstr "Pseudonim"
 #: actions/register.php:159 actions/editgroup.php:185
 #: actions/finishopenidlogin.php:231 actions/newgroup.php:135
 #: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonim jest już używany. Spróbuj innego."
 
@@ -1474,6 +1564,9 @@ msgstr "Pseudonim jest już używany. Spróbuj innego."
 #: actions/updateprofile.php:83 actions/editgroup.php:181
 #: actions/finishopenidlogin.php:221 actions/newgroup.php:131
 #: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
 
@@ -1483,7 +1576,7 @@ msgid "Nickname not allowed."
 msgstr "Niedozwolony pseudonim."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Pseudonim użytkownika którego chcesz obserwować"
 
@@ -1496,26 +1589,28 @@ msgstr "Pseudonim lub adres e-mail"
 #: actions/block.php:147 actions/deletenotice.php:118
 #: actions/deletenotice.php:116 actions/block.php:149
 #: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "Nie"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Brak identyfikatora Jabbera."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 #: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Brak żądania upoważnienia!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Nie wybrano operatora."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Nie podano kodu"
 
@@ -1528,12 +1623,14 @@ msgstr "Brak kodu potwierdzajÄ…cego."
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
 #: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
-#: actions/newnotice.php:162 lib/command.php:216
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Brak zawartości!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
 #: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Brak adresu e-mail."
 
@@ -1544,6 +1641,7 @@ msgstr "Brak identyfikatora."
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
 #: actions/emailsettings.php:430 actions/emailsettings.php:437
 #: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "Brak przychodzÄ…cego adresu e-mail."
 
@@ -1554,6 +1652,7 @@ msgstr "Zdalny serwer nie dostarczył pseudonimu."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Brak pseudonimu."
 
@@ -1562,11 +1661,13 @@ msgstr "Brak pseudonimu."
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
 #: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Brak oczekujących potwierdzeń do anulowania."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Brak numeru telefonu."
 
@@ -1577,6 +1678,7 @@ msgstr "Serwer nie zwrócił adresu URL profilu."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 #: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika."
 
@@ -1601,13 +1703,14 @@ msgstr "Brak rozmiaru."
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
 #: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
 #: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
-#: actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Nie znaleziono statusów z tym identyfikatorem."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
 #: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
-#: actions/twitapistatuses.php:399
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Nie znaleziono statusów z tym identyfikatorem."
 
@@ -1617,13 +1720,15 @@ msgid "No such OpenID."
 msgstr "Nie ma takiego identyfikatora OpenID."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Nie ma takiego dokumentu."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nie ma takiego wpisu."
 
@@ -1668,11 +1773,15 @@ msgstr "Nie ma takiej subskrypcji"
 #: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
 #: lib/command.php:178 lib/command.php:227 lib/command.php:264
 #: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Brak takiego użytkownika."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 #: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika."
 
@@ -1695,12 +1804,13 @@ msgstr "To nie jest zarejestrowany użytkownik."
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
 #: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
 #: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
-#: lib/twitterapi.php:741
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "To nie jest obsługiwany format danych."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "To nie jest prawidłowy identyfikator Jabbera"
 
@@ -1711,11 +1821,12 @@ msgstr "To nie jest prawidłowy identyfikator OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
 #: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "To nie jest prawidłowy adres e-mail"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-#: actions/register.php:189
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "To nie jest prawidłowy adres e-mail."
 
@@ -1725,6 +1836,9 @@ msgstr "To nie jest prawidłowy adres e-mail."
 #: actions/profilesettings.php:195 actions/register.php:161
 #: actions/editgroup.php:188 actions/newgroup.php:138
 #: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "To nie jest prawidłowy pseudonim."
 
@@ -1745,6 +1859,7 @@ msgstr "To nie jest prawidłowy adres URL profilu (brak dokumentu YADIS)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
 #: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "To nie jest obraz lub lub plik jest uszkodzony."
 
@@ -1755,12 +1870,13 @@ msgstr "Brak upoważnienia."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Nieoczekiwana odpowiedź!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
-#: actions/twitapistatuses.php:284
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Nie znaleziono"
 
@@ -1779,6 +1895,8 @@ msgstr "Nie znaleziono"
 #: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61
 #: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Niezalogowany."
 
@@ -1799,7 +1917,7 @@ msgid "Notice feed for %s"
 msgstr "Kanał wpisów dla %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Wpis nie posiada profilu"
 
@@ -1807,19 +1925,20 @@ msgstr "Wpis nie posiada profilu"
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
 #: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
 #: actions/conversation.php:149 lib/facebookaction.php:572
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Wpisy"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
 #: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
-#: actions/twitapitags.php:69
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Wpisy ze znacznikiem %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Stare hasło"
 
@@ -1886,7 +2005,7 @@ msgid "OpenID settings"
 msgstr "Ustawienia OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-#: actions/invite.php:186 actions/invite.php:188
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia."
 
@@ -1903,17 +2022,20 @@ msgstr "Częściowo wysłano."
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
 #: actions/login.php:214 lib/facebookaction.php:315
 #: actions/finishopenidlogin.php:117 actions/register.php:418
-#: lib/facebookaction.php:317
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Hasło"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 #: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Hasło i potwierdzenie nie pasują do siebie."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 #: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Hasło musi mieć sześć lub więcej znaków."
 
@@ -1921,6 +2043,7 @@ msgstr "Hasło musi mieć sześć lub więcej znaków."
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 #: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Zażądano przywracania hasła"
 
@@ -1928,6 +2051,7 @@ msgstr "Zażądano przywracania hasła"
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Zapisano hasło."
 
@@ -1935,6 +2059,7 @@ msgstr "Zapisano hasło."
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Hasła nie pasują do siebie."
 
@@ -1959,12 +2084,12 @@ msgid "Personal"
 msgstr "Osobiste"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-#: actions/invite.php:184 actions/invite.php:186
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Osobista wiadomość"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
-#: actions/smssettings.php:128
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa"
 
@@ -1978,7 +2103,7 @@ msgstr ""
 "użytkownika. Jeśli nie chcesz, po prostu naciśnij \"Anuluj\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Wyślij wpis, kiedy zmieni się mój status na Jabberze/GTalk."
 
@@ -1988,6 +2113,8 @@ msgstr "Wyślij wpis, kiedy zmieni się mój status na Jabberze/GTalk."
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
 #: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Preferencje"
 
@@ -1997,39 +2124,44 @@ msgstr "Preferencje"
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
 #: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Zapisano preferencje."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Preferowany język"
 
 #: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
-#: lib/action.php:715
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Prywatność"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
 #: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
-#: classes/Notice.php:216 classes/Notice.php:232
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Problem podczas zapisywania wpisu."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
 #: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profil"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "Adres URL profilu"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Ustawienia profilu"
 
@@ -2046,17 +2178,18 @@ msgstr "Kanał publicznego strumienia"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
 #: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
-#: actions/public.php:120
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Publiczna oÅ› czasu"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Opublikuj MicroID adresu Jabbera/GTalk."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
 #: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Opublikuj MicroID adresu e-mail."
 
@@ -2067,11 +2200,13 @@ msgstr "Ostatnie znaczniki"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 #: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Przywróć"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 #: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Przywróć hasło"
 
@@ -2086,7 +2221,8 @@ msgstr "Kod przywracania dla nieznanego użytkownika."
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
 #: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
 #: actions/register.php:108 actions/register.php:486 lib/action.php:440
-#: lib/facebookaction.php:281
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Zarejestruj siÄ™"
 
@@ -2104,13 +2240,14 @@ msgstr "Rejestracja powiodła się"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 #: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Odrzuć"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
 #: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
-#: actions/register.php:461
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
@@ -2120,7 +2257,7 @@ msgid "Remote profile with no matching profile"
 msgstr "Zdalny profil bez odpowiadajÄ…cego profilu"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Zasubskrybuj zdalnie"
 
@@ -2134,7 +2271,9 @@ msgstr "Zasubskrybuj zdalnie"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
-#: actions/twittersettings.php:118
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Usuń"
 
@@ -2161,28 +2300,32 @@ msgstr "Odpowiedzi"
 #: actions/replies.php:116 actions/repliesrss.php:67
 #: lib/personalgroupnav.php:104 actions/replies.php:118
 #: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpowiedzi na %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 #: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Przywróć"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 #: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Przywróć hasło"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
 #: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "Numer telefonu SMS"
 
@@ -2197,11 +2340,12 @@ msgstr "Potwierdzenie SMS"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 #: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Takie samo jak powyższe hasło"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377 actions/register.php:423
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Takie samo jak powyższe hasło. Wymagane."
 
@@ -2219,12 +2363,16 @@ msgstr "Takie samo jak powyższe hasło. Wymagane."
 #: actions/twittersettings.php:164 actions/othersettings.php:119
 #: actions/profilesettings.php:152 actions/subscriptions.php:185
 #: actions/twittersettings.php:180 lib/designsettings.php:256
-#: lib/groupeditform.php:196
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Zapisz"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
 #: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Znajdź"
 
@@ -2254,7 +2402,7 @@ msgstr ""
 "znaki lub więcej."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Wybierz operatora"
 
@@ -2262,28 +2410,30 @@ msgstr "Wybierz operatora"
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
 #: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
 #: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
-#: lib/noticeform.php:179
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Wyślij"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Wyślij wiadomość e-mail na ten adres, aby wysyłać nowe wpisy."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Wyślij mi wpisy nowych subskrypcji przez e-mail."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Wyślij mi wpisy przez Jabbera/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
-#: actions/smssettings.php:162
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2292,7 +2442,7 @@ msgstr ""
 "swojego operatora."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
-#: actions/imsettings.php:147
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Wyślij mi odpowiedzi przez Jabbera/GTalk od osób, których nie subskrybuję."
@@ -2304,6 +2454,7 @@ msgstr "Ustawienia"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
 #: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Zapisano ustawienia."
 
@@ -2333,13 +2484,14 @@ msgid "Sorry, that is not your incoming email address."
 msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail."
 
 #: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
-#: lib/action.php:717
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Kod źródłowy"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
 #: actions/showstream.php:476 actions/showgroup.php:375
 #: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Statystyki"
 
@@ -2356,6 +2508,7 @@ msgstr "Nie znaleziono przechowywanego identyfikatora OpenID."
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Zasubskrybuj"
 
@@ -2369,13 +2522,13 @@ msgstr "Subskrybenci"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 #: actions/userauthorization.php:338 actions/userauthorization.php:344
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Upoważniono subskrypcję"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 #: actions/userauthorization.php:349 actions/userauthorization.php:355
-#: actions/userauthorization.php:389
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Odrzucono subskrypcjÄ™"
 
@@ -2390,6 +2543,7 @@ msgstr "Subskrypcje"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
 #: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Błąd systemu podczas wysyłania pliku."
 
@@ -2400,6 +2554,7 @@ msgstr "Błąd systemu podczas wysyłania pliku."
 #: actions/tagother.php:209 lib/profilelist.php:160
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Znaczniki"
 
@@ -2429,7 +2584,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Ten kod potwierdzajÄ…cy nie jest przeznaczony dla Ciebie!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-#: actions/emailsettings.php:328
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Ten adres e-mail należy już do innego użytkownika."
 
@@ -2439,49 +2594,52 @@ msgid "That file is too big."
 msgstr "Ten plik jest za duży."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Ten identyfikator Jabbera jest już Twój."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
 #: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Ten adres e-mail jest już Twój."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Ten numer telefonu jest już Twój."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "To nie jest Twój identyfikator Jabbera."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
 #: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "To nie jest Twój adres e-mail."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "To nie jest Twój numer telefonu."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "To jest błędny adres komunikatora."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "To jest błędny numer potwierdzenia."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Ten numer telefonu należy już do innego użytkownika."
 
@@ -2512,6 +2670,8 @@ msgstr "Adres \"%s\" został potwierdzony dla Twojego konta."
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
 #: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "Adres został usunięty."
 
@@ -2558,7 +2718,7 @@ msgid "These are the people whose notices you listen to."
 msgstr "Osoby, których wpisy obserwujesz."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-#: actions/invite.php:130
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
@@ -2595,7 +2755,7 @@ msgstr ""
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
 #: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
 #: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
-#: actions/twitapistatuses.php:416
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Ta metoda wymaga POST lub DELETE."
 
@@ -2608,6 +2768,12 @@ msgstr "Ta metoda wymaga POST lub DELETE."
 #: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
 #: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
 #: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Ta metoda wymaga POST."
 
@@ -2617,15 +2783,18 @@ msgstr "Ta strona jest niedostępna dla akceptowanego typu medium"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
 #: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Nie wybrano strefy czasowej."
 
 #: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2639,18 +2808,20 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Należy dostarczyć dwa identyfikatory lub nazwy użytkowników."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
 #: actions/profilesettings.php:109 actions/register.php:398
-#: actions/register.php:444
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Adres URL strony domowej, bloga lub profilu na innej stronie"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
 
@@ -2665,16 +2836,19 @@ msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
 #: actions/avatarsettings.php:263 actions/emailsettings.php:247
 #: actions/grouplogo.php:324 actions/twittersettings.php:306
 #: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane wysłanie formularza."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 #: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Nieoczekiwane przywrócenie hasła."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-#: actions/recoverpassword.php:210
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Nieznane działanie"
 
@@ -2711,22 +2885,24 @@ msgstr "Nieobsługiwana wersja OMB"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
 #: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Nieobsługiwany format pliku obrazu."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Aktualizacje przez wiadomości SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Aktualizacje przez komunikator"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
 #: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
-#: actions/twitapistatuses.php:94
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Aktualizacje od %1$s i przyjaciół na %2$s!"
@@ -2734,6 +2910,8 @@ msgstr "Aktualizacje od %1$s i przyjaciół na %2$s!"
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
 #: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
 #: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aktualizacje od %1$s na %2$s!"
@@ -2741,6 +2919,7 @@ msgstr "Aktualizacje od %1$s na %2$s!"
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
 #: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Wyślij"
 
@@ -2761,7 +2940,7 @@ msgid "Upload a new profile image"
 msgstr "Wyślij nowy obraz profilu"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-#: actions/invite.php:156
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -2771,6 +2950,7 @@ msgstr ""
 #: ../actions/register.php:159 ../actions/register.php:162
 #: actions/register.php:173 actions/register.php:176 actions/register.php:382
 #: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
@@ -2798,11 +2978,12 @@ msgstr "Obserwowany użytkownik nie istnieje."
 #: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
 #: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Użytkownik nie posiada profilu."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Pseudonim użytkownika"
 
@@ -2812,10 +2993,12 @@ msgstr "Nie znaleziono użytkownika."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "W jakiej strefie czasowej zwykle siÄ™ znajdujesz?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
@@ -2823,7 +3006,8 @@ msgstr "Co słychać, %s?"
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
 #: actions/profilesettings.php:119 actions/register.php:410
-#: actions/register.php:456
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
 
@@ -2844,7 +3028,7 @@ msgstr "Błędny rozmiar obrazu \"%s\""
 #: actions/block.php:148 actions/deletenotice.php:122
 #: actions/deletenotice.php:141 actions/deletenotice.php:115
 #: actions/block.php:150 actions/deletenotice.php:116
-#: actions/groupblock.php:177
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Tak"
 
@@ -2867,7 +3051,7 @@ msgid "You are already logged in!"
 msgstr "Jesteś już zalogowany!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-#: actions/invite.php:122
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Jesteś już zasubskrybowany do tych użytkowników:"
 
@@ -2909,6 +3093,7 @@ msgstr ""
 "Skonfiguruj adres i ustawienia poniżej."
 
 #: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2919,13 +3104,14 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Można używać lokalnej subskrypcji!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
 #: actions/finishopenidlogin.php:43 actions/register.php:149
-#: actions/register.php:186
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
@@ -2958,7 +3144,7 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 #: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
-#: actions/twitapistatuses.php:443
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Nie można usuwać statusów innych użytkowników."
 
@@ -2970,7 +3156,7 @@ msgstr ""
 "Należy być zalogowanym, aby zapraszać innych użytkowników do używania %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-#: actions/invite.php:144
+#: actions/invite.php:144 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!"
@@ -3003,56 +3189,56 @@ msgstr ""
 "identyfikatorami OpenID."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "kilka sekund temu"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "około %d dni temu"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "około %d godzin temu"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "około %d minut temu"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "około %d miesięcy temu"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "blisko dzień temu"
 
 #: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
-#: lib/util.php:772
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "około minutę temu"
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "około miesiąc temu"
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "około rok temu"
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
-#: lib/util.php:776
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "około godzinę temu"
 
@@ -3074,7 +3260,7 @@ msgid "reply"
 msgstr "odpowiedz"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "takie samo jak hasło powyżej"
 
@@ -3114,7 +3300,14 @@ msgstr "« Następne"
 #: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
 #: actions/othersettings.php:138 actions/recoverpassword.php:334
 #: actions/register.php:153 actions/twittersettings.php:310
-#: lib/designsettings.php:291
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
 
@@ -3123,7 +3316,7 @@ msgid "This notice is not a favorite!"
 msgstr "Ten wpis nie jest ulubiony!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
-#: actions/twitapifavorites.php:188
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Nie można usunąć ulubionego wpisu."
 
@@ -3132,10 +3325,12 @@ msgid "Favor"
 msgstr "Dodaj do ulubionych"
 
 #: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi prywatną wiadomość."
 
@@ -3150,6 +3345,7 @@ msgstr "Ten wpis jest już ulubiony!"
 #: actions/twitapifavorites.php:125 classes/Command.php:152
 #: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
 #: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Nie można utworzyć ulubionego wpisu."
 
@@ -3215,7 +3411,7 @@ msgid "That's too long. Max message size is 140 chars."
 msgstr "Wiadomość jest za długa. Maksymalna długość to 140 znaków."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
-#: actions/newmessage.php:155
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Nie podano odbiorcy."
 
@@ -3223,7 +3419,8 @@ msgstr "Nie podano odbiorcy."
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
 #: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
-#: lib/command.php:230
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Nie można wysłać wiadomości do tego użytkownika."
 
@@ -3232,17 +3429,19 @@ msgstr "Nie można wysłać wiadomości do tego użytkownika."
 #: classes/Command.php:240 actions/newmessage.php:161
 #: actions/twitapidirect_messages.php:167 lib/command.php:240
 #: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
 #: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "Nie ma takiego użytkownika"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
-#: actions/newmessage.php:71
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nowa wiadomość"
 
@@ -3301,7 +3500,8 @@ msgstr "Można tutaj zaktualizować osobiste informacje profilu "
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:182
 #: actions/grouplogo.php:183 actions/remotesubscribe.php:366
 #: actions/remotesubscribe.php:364 actions/userauthorization.php:215
-#: actions/userrss.php:103
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Użytkownik bez odpowiadającego profilu"
 
@@ -3331,6 +3531,7 @@ msgstr "Pomyślnie zapisano nowe hasło. "
 
 #: actions/register.php:95 actions/register.php:180
 #: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Hasło musi mieć sześć lub więcej znaków."
 
@@ -3359,6 +3560,7 @@ msgstr "Kanał ulubionych wpisów użytkownika %s"
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
 #: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Nie można odebrać ulubionych wpisów."
 
@@ -3391,12 +3593,14 @@ msgstr "Operator komórkowy Twojego telefonu. "
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Bezpośrednia wiadomość do użytkownika %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
@@ -3408,6 +3612,7 @@ msgstr "Wysłane bezpośrednie wiadomości"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Wszystkie bezpośrednie wiadomości wysłane od użytkownika %s"
@@ -3415,21 +3620,21 @@ msgstr "Wszystkie bezpośrednie wiadomości wysłane od użytkownika %s"
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
 #: actions/twitapidirect_messages.php:146
-#: actions/twitapidirect_messages.php:140
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Brak tekstu wiadomości!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
 #: actions/twitapidirect_messages.php:159
-#: actions/twitapidirect_messages.php:154
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Nie znaleziono odbiorcy."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
 #: actions/twitapidirect_messages.php:162
-#: actions/twitapidirect_messages.php:158
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
@@ -3437,12 +3642,14 @@ msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s/ulubione wpisy od %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "Użytkownik %s aktualizuje ulubione według %s/%s."
@@ -3612,41 +3819,42 @@ msgstr "Subskrypcje: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
 #: classes/Command.php:276 lib/command.php:145 lib/command.php:276
-#: lib/command.php:138 lib/command.php:269
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "Użytkownik nie posiada ostatniego wpisu"
 
 #: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
-#: lib/command.php:159
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Zaznaczono wpis jako ulubiony."
 
 #: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
-#: lib/command.php:182
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
-#: lib/command.php:185
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "ImiÄ™ i nazwisko: %s"
 
 #: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
-#: lib/command.php:188
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Położenie: %s"
 
 #: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
-#: lib/command.php:191
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Strona domowa: %s"
 
 #: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
-#: lib/command.php:194
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "O mnie: %s"
@@ -3658,61 +3866,63 @@ msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Wiadomość jest za długa - maksymalnie 140 znaków, wysłano %d"
 
 #: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
-#: actions/newmessage.php:182 lib/command.php:238
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s"
 
 #: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
-#: lib/command.php:240
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
 
 #: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
-#: lib/command.php:293
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Podaj nazwę użytkownika do zasubskrybowania"
 
 #: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
-#: lib/command.php:300
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Zasubskrybowano użytkownika %s"
 
 #: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
-#: lib/command.php:321
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji"
 
 #: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
-#: lib/command.php:328
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Usunięto subskrypcję użytkownika %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
 #: classes/Command.php:376 lib/command.php:353 lib/command.php:376
-#: lib/command.php:346 lib/command.php:369
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Nie zaimplementowano polecenia."
 
 #: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
-#: lib/command.php:349
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Wyłączono powiadomienia."
 
 #: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
-#: lib/command.php:351
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "Nie można wyłączyć powiadomień."
 
 #: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
-#: lib/command.php:372
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "WÅ‚Ä…czono powiadomienia."
 
 #: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
-#: lib/command.php:374
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Nie można włączyć powiadomień."
 
@@ -3720,11 +3930,11 @@ msgstr "Nie można włączyć powiadomień."
 msgid "Commands:\n"
 msgstr "Polecenia:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "Nie można wprowadzić wiadomości."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
 
@@ -3770,7 +3980,7 @@ msgstr "Ulubione"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 #: actions/favoritesrss.php:110 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:115
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Ulubione wpisy użytkownika %s"
@@ -3810,7 +4020,7 @@ msgstr "Opcje integracji z Twitterem"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 #: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
-#: lib/noticelist.php:433
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "Do"
 
@@ -3821,7 +4031,7 @@ msgstr "Nie można przeanalizować wiadomości."
 
 #: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
 #: actions/facebookhome.php:161 actions/all.php:48
-#: actions/facebookhome.php:156
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "Użytkownik %s i przyjaciele, strona %d"
@@ -3833,6 +4043,7 @@ msgstr "Można wysłać osobisty awatar."
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
 #: actions/grouplogo.php:250 actions/avatarsettings.php:119
 #: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Ustawienia awatara"
 
@@ -3840,6 +4051,7 @@ msgstr "Ustawienia awatara"
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
 #: actions/avatarsettings.php:126 actions/avatarsettings.php:202
 #: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Oryginał"
 
@@ -3847,11 +4059,13 @@ msgstr "Oryginał"
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
 #: actions/avatarsettings.php:141 actions/avatarsettings.php:214
 #: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "PodglÄ…d"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
 #: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Przytnij"
 
@@ -3874,11 +4088,13 @@ msgstr "Wybierz kwadratowy obszar obrazu do awatara"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
 #: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Utracono dane pliku."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
 #: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "Utracono plik."
 
@@ -3886,6 +4102,7 @@ msgstr "Utracono plik."
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
 #: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
 #: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "Nieznany typ pliku"
 
@@ -3943,7 +4160,8 @@ msgid "Inboxes must be enabled for groups to work"
 msgstr "Skrzynki odbiorcze grup muszą być włączone, aby działały"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-#: actions/grouplogo.php:75 actions/editgroup.php:73
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Musisz być zalogowany, aby utworzyć grupę."
 
@@ -3952,6 +4170,8 @@ msgstr "Musisz być zalogowany, aby utworzyć grupę."
 #: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:89
 #: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "Brak pseudonimu"
 
@@ -3960,18 +4180,23 @@ msgstr "Brak pseudonimu"
 #: actions/showgroup.php:128 actions/grouplogo.php:104
 #: actions/grouprss.php:103 actions/blockedfromgroup.php:80
 #: actions/editgroup.php:101 actions/groupdesignsettings.php:102
-#: actions/showgroup.php:133
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "Nie ma takiej grupy"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
 #: actions/grouplogo.php:107 actions/grouplogo.php:111
 #: actions/editgroup.php:108 actions/editgroup.php:167
-#: actions/groupdesignsettings.php:109
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Musisz być administratorem, aby zmodyfikować grupę"
 
 #: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Użyj tego formularza, aby zmodyfikować grupę."
 
@@ -4006,6 +4231,7 @@ msgid "Send me email when someone "
 msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś "
 
 #: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Pozwól przyjaciołom na szturchanie mnie i wyślij mi wiadomość e-mail."
 
@@ -4044,18 +4270,21 @@ msgstr "Brak zawartości wpisu!"
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
 #: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
 #: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Paginacja"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
 #: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
 #: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "Następne"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
 #: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
 #: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "Wcześniej"
 
@@ -4136,6 +4365,7 @@ msgstr "Usuń wpis z ulubionych"
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
 #: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
 #: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Popularne wpisy"
 
@@ -4164,16 +4394,17 @@ msgstr "Znani użytkownicy, strona %d"
 msgid "A selection of some of the great users on %s"
 msgstr "Wybór znanych użytkowników na %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Ten użytkownik zablokował Cię z subskrypcji."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "Brak identyfikatora"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
 #: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Logo grupy"
 
@@ -4182,10 +4413,12 @@ msgid "You can upload a logo image for your group."
 msgstr "Można wysłać obraz logo dla grupy."
 
 #: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Zaktualizowano logo."
 
 #: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "Zaktualizowanie logo nie powiodło się."
 
@@ -4252,20 +4485,20 @@ msgstr "Wyślij mi odpowiedzi przez Jabbera/GTalk "
 msgid "A confirmation code was sent "
 msgstr "Kod potwierdzający został wysłany "
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "Musisz być zalogowany, aby dołączyć do grupy."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "Jesteś już członkiem tej grupy"
 
-#: actions/joingroup.php:128 actions/joingroup.php:133
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Nie można dołączyć użytkownika %s do grupy %s"
 
-#: actions/joingroup.php:135 actions/joingroup.php:140
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "Użytkownik %s dołączył do grupy %s"
@@ -4274,16 +4507,18 @@ msgstr "Użytkownik %s dołączył do grupy %s"
 msgid "Inboxes must be enabled for groups to work."
 msgstr "Skrzynki odbiorcze dla grup muszą być włączone, aby działały."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Musisz być zalogowany, aby opuścić grupę."
 
 #: actions/leavegroup.php:88 actions/groupblock.php:86
 #: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "Nie ma takiej grupy."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "Nie jesteś członkiem tej grupy."
 
@@ -4292,20 +4527,24 @@ msgid "You may not leave a group while you are its administrator."
 msgstr "Nie możesz opuścić grupy, kiedy jesteś jej administratorem."
 
 #: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr "Nie można znaleźć wpisu członkostwa."
 
 #: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Nie można usunąć użytkownika %s z grupy %s"
 
 #: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "Użytkownik %s opuścił grupę %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "Zaloguj siÄ™ na stronie"
 
@@ -4317,15 +4556,17 @@ msgstr "Brak obecnego statusu"
 msgid "New group"
 msgstr "Nowa grupa"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "Użyj tego formularza, aby utworzyć nową grupę."
 
 #: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "Nie można utworzyć grupy."
 
 #: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr "Nie można ustawić członkostwa w grupie."
 
@@ -4338,12 +4579,13 @@ msgid "Don't send a message to yourself; "
 msgstr "Nie wysyłaj wiadomości do siebie; "
 
 #: actions/newnotice.php:166 actions/newnotice.php:174
-#: actions/newnotice.php:272
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "Wysłano wpis"
 
 #: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
 #: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "BÅ‚Ä…d AJAX"
 
@@ -4387,10 +4629,12 @@ msgid "Service"
 msgstr "Usługa"
 
 #: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Używana automatyczna usługa skracania."
 
 #: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)."
 
@@ -4399,6 +4643,7 @@ msgid "Change your password."
 msgstr "Zmień hasło."
 
 #: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr "Zmiana hasła"
 
@@ -4417,11 +4662,12 @@ msgstr "Użytkownicy używający znacznika %s - strona %d"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "To są użytkownicy którzy nadali sobie znacznik \"%s\" "
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informacje o profilu"
 
 #: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4434,20 +4680,24 @@ msgstr "Automatycznie zasubskrybuj do każdego "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
 #: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Nieprawidłowy znacznik: \"%s\""
 
 #: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "Nie można zapisać znaczników."
 
 #: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Publiczna oÅ› czasu, strona %d"
 
 #: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Nie można pobrać publicznego strumienia."
 
@@ -4474,7 +4724,8 @@ msgid "Tag cloud"
 msgstr "Chmura znaczników"
 
 #: actions/register.php:139 actions/register.php:349 actions/register.php:79
-#: actions/register.php:177 actions/register.php:394
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Przepraszamy, tylko zaproszone osoby mogą się rejestrować."
 
@@ -4524,6 +4775,7 @@ msgid "That's a local profile! Login to subscribe."
 msgstr "To jest profil lokalny! Zaloguj się, aby zasubskrybować."
 
 #: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Odpowiedzi na %s, strona %d"
@@ -4544,7 +4796,7 @@ msgid "%s group, page %d"
 msgstr "Grupa %s, strona %d"
 
 #: actions/showgroup.php:206 actions/showgroup.php:208
-#: actions/showgroup.php:213
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Profil grupy"
 
@@ -4553,7 +4805,9 @@ msgstr "Profil grupy"
 #: actions/showgroup.php:253 actions/showstream.php:271
 #: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
 #: actions/showstream.php:236 actions/userauthorization.php:137
-#: lib/profilelist.php:197
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "Adres URL"
 
@@ -4562,12 +4816,14 @@ msgstr "Adres URL"
 #: actions/showgroup.php:264 actions/showstream.php:282
 #: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
 #: actions/showstream.php:247 actions/userauthorization.php:149
-#: lib/profilelist.php:212
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr "Wpis"
 
 #: actions/showgroup.php:270 actions/showgroup.php:272
-#: actions/showgroup.php:288
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Działania grupy"
 
@@ -4578,7 +4834,8 @@ msgstr "Kanał wpisów dla grupy %s"
 
 #: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
 #: actions/showgroup.php:384 actions/showgroup.php:373
-#: actions/showgroup.php:430
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Członkowie"
 
@@ -4587,11 +4844,12 @@ msgstr "Członkowie"
 #: lib/tagcloudsection.php:71 actions/showgroup.php:344
 #: actions/showgroup.php:378 lib/profileaction.php:117
 #: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(Brak)"
 
 #: actions/showgroup.php:370 actions/showgroup.php:350
-#: actions/showgroup.php:384
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "Wszyscy członkowie"
 
@@ -4619,24 +4877,28 @@ msgstr " - profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "Profil użytkownika"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 #: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Zdjęcie"
 
 #: actions/showstream.php:317 actions/showstream.php:309
-#: actions/showstream.php:274
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "Działania użytkownika"
 
 #: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
 
 #: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Wiadomość"
 
@@ -4669,7 +4931,7 @@ msgstr "Wyślij mi wpisy przez SMS; "
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Kod potwierdzający został wysłany na dodany numer telefonu. "
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Operator komórkowy"
 
@@ -4728,11 +4990,11 @@ msgid "These are the people whose "
 msgstr "Osoby, których "
 
 #: actions/subscriptions.php:122 actions/subscriptions.php:124
-#: actions/subscriptions.php:183
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Wpisy ze znacznikiem %s, strona %d"
@@ -4797,15 +5059,17 @@ msgid "Microblog tagged with %s"
 msgstr "Mikroblogi ze znacznikiem %s"
 
 #: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Zablokowanie użytkownika nie powiodło się."
 
 #: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "Odblokowanie użytkownika nie powiodło się."
 
 #: actions/twitapiusers.php:48 actions/twitapiusers.php:52
-#: actions/twitapiusers.php:50
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Nie znaleziono."
 
@@ -4839,19 +5103,20 @@ msgstr "Nie można pobrać informacji o koncie "
 msgid "Error removing the block."
 msgstr "BÅ‚Ä…d podczas usuwania blokady."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "Brak identyfikatora profilu w żądaniu."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "Brak profilu z tym identyfikatorem."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Zrezygnowano z subskrypcji"
 
 #: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "Grupy %s"
@@ -4862,10 +5127,12 @@ msgid "%s groups, page %d"
 msgstr "Grupy %s, strona %d"
 
 #: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
 
 #: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4873,47 +5140,50 @@ msgstr ""
 "kilka minut."
 
 #: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Zabroniono Ci wysyłania wpisów na tej stronie."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Wyślij awatar"
 
 #: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Inne"
 
 #: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Inne opcje"
 
-#: lib/action.php:130 lib/action.php:132 lib/action.php:142
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145 lib/action.php:147 lib/action.php:157
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Strona bez nazwy"
 
-#: lib/action.php:316 lib/action.php:387 lib/action.php:411
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Główna nawigacja strony"
 
-#: lib/action.php:322 lib/action.php:393 lib/action.php:417
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Profil osobisty i oś czasu przyjaciół"
 
-#: lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Znajdź osoby lub tekst"
 
-#: lib/action.php:328 lib/action.php:399 lib/action.php:419
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Konto"
 
-#: lib/action.php:328 lib/action.php:399 lib/action.php:419
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Zmień adres e-mail, awatar, hasło, profil"
 
@@ -4921,15 +5191,15 @@ msgstr "Zmień adres e-mail, awatar, hasło, profil"
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Połącz z komunikatorem, SMS, Twitterem"
 
-#: lib/action.php:332 lib/action.php:409 lib/action.php:435
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Wyloguj siÄ™ ze strony"
 
-#: lib/action.php:335 lib/action.php:412 lib/action.php:443
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Zaloguj siÄ™ na stronÄ™"
 
-#: lib/action.php:338 lib/action.php:415 lib/action.php:440
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Utwórz konto"
 
@@ -4937,44 +5207,46 @@ msgstr "Utwórz konto"
 msgid "Login with OpenID"
 msgstr "Zaloguj siÄ™ za pomocÄ… OpenID"
 
-#: lib/action.php:344 lib/action.php:421 lib/action.php:446
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "Pomóż mi!"
 
-#: lib/action.php:362 lib/action.php:441 lib/action.php:468
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr "Wpis strony"
 
-#: lib/action.php:417 lib/action.php:504 lib/action.php:531
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "Lokalne widoki"
 
-#: lib/action.php:472 lib/action.php:559 lib/action.php:597
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr "Wpis strony"
 
-#: lib/action.php:562 lib/action.php:654 lib/action.php:699
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Druga nawigacja strony"
 
 #: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
-#: lib/action.php:749 lib/action.php:770
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Licencja oprogramowania StatusNet"
 
-#: lib/action.php:630 lib/action.php:727 lib/action.php:779
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "Wszystko "
 
-#: lib/action.php:635 lib/action.php:732 lib/action.php:784
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "licencja."
 
 #: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "Zablokuj tego użytkownika"
 
 #: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Zablokuj"
 
@@ -5015,14 +5287,17 @@ msgid "All"
 msgstr "Wszystko"
 
 #: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Znacznik"
 
 #: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Wybierz znacznik do ograniczonej listy"
 
 #: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Przejdź"
 
@@ -5031,6 +5306,7 @@ msgid "URL of the homepage or blog of the group or topic"
 msgstr "Adres URL strony domowej lub bloga grupy, albo temat"
 
 #: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Opis"
 
@@ -5039,6 +5315,7 @@ msgid "Describe the group or topic in 140 chars"
 msgstr "Opisz grupÄ™ lub temat w 140 znakach"
 
 #: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
@@ -5092,11 +5369,11 @@ msgstr "Dołącz"
 msgid "Leave"
 msgstr "Opuść"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Załóż nowe konto"
 
@@ -5157,15 +5434,16 @@ msgstr "%1$s właśnie dodał Twój wpis z %2$s"
 msgid "From"
 msgstr "Od"
 
-#: lib/messageform.php:110 lib/messageform.php:109
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Wyślij bezpośredni wpis"
 
-#: lib/noticeform.php:125 lib/noticeform.php:128
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "Wyślij wpis"
 
-#: lib/noticeform.php:152 lib/noticeform.php:149
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Dostępne znaki"
 
@@ -5175,21 +5453,23 @@ msgstr "w odpowiedzi na"
 
 #: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
 #: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Odpowiedz na ten wpis"
 
 #: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Odpowiedz"
 
 #: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
 #: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
-#: lib/noticelist.php:486
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Usuń ten wpis"
 
 #: lib/noticelist.php:474 actions/avatarsettings.php:148
-#: lib/noticelist.php:479 lib/noticelist.php:486
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Usuń"
 
@@ -5264,6 +5544,7 @@ msgid "Groups %s is a member of"
 msgstr "Grupy %s są członkiem"
 
 #: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Zaproś przyjaciół i kolegów do dołączenia do Ciebie na %s"
@@ -5273,7 +5554,7 @@ msgid "User has blocked you."
 msgstr "Użytkownik zablokował Cię."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
-#: actions/userauthorization.php:178
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Zasubskrybuj tego użytkownika"
 
@@ -5298,22 +5579,22 @@ msgstr "Odblokuj"
 msgid "Unsubscribe from this user"
 msgstr "Zrezygnuj z subskrypcji tego użytkownika"
 
-#: actions/all.php:77 actions/all.php:59
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Kanał dla znajomych użytkownika %s (RSS 1.0)"
 
-#: actions/all.php:82 actions/all.php:64
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Kanał dla znajomych użytkownika %s (RSS 2.0)"
 
-#: actions/all.php:87 actions/all.php:69
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Kanał dla znajomych użytkownika %s (Atom)"
 
-#: actions/all.php:112 actions/all.php:125
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
 msgid "You and friends"
 msgstr "Ty i przyjaciele"
 
@@ -5336,7 +5617,7 @@ msgstr ""
 "do Ciebie zostanie usunięta, nie będzie mógł Cię zasubskrybować w "
 "przyszłości i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego."
 
-#: actions/deletenotice.php:73
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -5344,11 +5625,11 @@ msgstr ""
 "Za chwilę wpis zostanie trwale usunięty. Kiedy to się stanie, to już się nie "
 "odstanie."
 
-#: actions/deletenotice.php:127
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
 msgid "There was a problem with your session token.  Try again, please."
 msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi odpowiedź \"@\"."
 
@@ -5375,13 +5656,13 @@ msgstr ""
 "Jeśli chcesz, aby %s automatycznie aktualizowało status na Facebook "
 "najnowszym wpisem, musisz dać mu pozwolenie."
 
-#: actions/grouplogo.php:155
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "Można wysłać obraz logo grupy. Maksymalny rozmiar pliku to %s."
 
-#: actions/grouplogo.php:367
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
 msgid "Pick a square area of the image to be the logo."
 msgstr "Wybierz kwadratowy obszar obrazu, który będzie logo."
 
@@ -5432,19 +5713,19 @@ msgstr ""
 "Z powodów bezpieczeństwa przed zmienianiem ustawień zaloguj się ponownie za "
 "pomocÄ… identyfikatora [OpenID](%%doc.openid%%)."
 
-#: actions/public.php:125 actions/public.php:133
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Kanał publicznego strumienia (RSS 1.0)"
 
-#: actions/public.php:130 actions/public.php:138
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Kanał publicznego strumienia (RSS 2.0)"
 
-#: actions/public.php:135 actions/public.php:143
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
 msgid "Public Stream Feed (Atom)"
 msgstr "Kanał publicznego strumienia (Atom)"
 
-#: actions/public.php:210 actions/public.php:241
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5469,11 +5750,11 @@ msgstr ""
 "[OpenID](http://openid.net/)? Wypróbuj [rejestracji OpenID](%%action."
 "openidlogin%%)!)"
 
-#: actions/register.php:432 actions/register.php:479
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
 msgid "Creative Commons Attribution 3.0"
 msgstr "Creative Commons Uznanie Autorstwa 3.0"
 
-#: actions/register.php:433 actions/register.php:480
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
@@ -5482,10 +5763,12 @@ msgstr ""
 "numer telefonu."
 
 #: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
 msgid "Created"
 msgstr "Utworzono"
 
 #: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5531,18 +5814,22 @@ msgid "FOAF for %s"
 msgstr "FOAF dla %s"
 
 #: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
 msgid "Edit Avatar"
 msgstr "Edytuj awatar"
 
 #: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
 msgid "Edit profile settings"
 msgstr "Edytuj ustawienia profilu"
 
 #: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
 msgid "Edit"
 msgstr "Edytuj"
 
 #: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5556,7 +5843,7 @@ msgstr ""
 "obserwować wpisy użytkownika **%s** i wiele więcej! ([Przeczytaj więcej](%%%%"
 "doc.help%%%%))"
 
-#: actions/smssettings.php:335
+#: actions/smssettings.php:335 actions/smssettings.php:347
 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."
@@ -5595,7 +5882,14 @@ msgstr ""
 "%5$s\n"
 
 #: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
-#: actions/twitapistatuses.php:314
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
 msgid "No such user!"
 msgstr "Nie ma takiego użytkownika!"
 
@@ -5626,7 +5920,7 @@ msgstr ""
 msgid "Search for more groups"
 msgstr "Znajdź więcej grup"
 
-#: classes/Notice.php:138 classes/Notice.php:154
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -5638,11 +5932,11 @@ msgstr ""
 msgid "Connect to SMS, Twitter"
 msgstr "Połącz z SMS, Twitterem"
 
-#: lib/action.php:671 lib/action.php:721
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
 msgid "Badge"
 msgstr "Odznaka"
 
-#: lib/command.php:113 lib/command.php:106
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5921,7 +6215,7 @@ msgstr "Znajdź stronę"
 msgid "More..."
 msgstr "Więcej..."
 
-#: actions/all.php:80
+#: actions/all.php:80 actions/all.php:127
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -5929,7 +6223,7 @@ msgstr ""
 "To jest oś czasu użytkownika %s i przyjaciół, ale nikt jeszcze nic nie "
 "wysłał."
 
-#: actions/all.php:85
+#: actions/all.php:85 actions/all.php:132
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -5938,7 +6232,7 @@ msgstr ""
 "Spróbuj zasubskrybować więcej osób, [dołączyć do grupy](%%action.groups%%) "
 "lub wysłać coś samemu."
 
-#: actions/all.php:87
+#: actions/all.php:87 actions/all.php:134
 #, php-format
 msgid ""
 "You can try to [nudge %s](../%s) from his profile or [post something to his "
@@ -5949,6 +6243,7 @@ msgstr ""
 "status_textarea=%s)."
 
 #: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -5991,30 +6286,39 @@ msgstr "Odblokuj użytkownika w tej grupie"
 msgid "Conversation"
 msgstr "Rozmowa"
 
-#: actions/deletenotice.php:115
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
 msgid "Do not delete this notice"
 msgstr "Nie usuwaj tego wpisu"
 
 #: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "Za dużo aliasów! Maksymalnie %d."
 
 #: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Nieprawidłowy alias: \"%s\""
 
 #: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
 
 #: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nie może być taki sam jak pseudonim."
 
 #: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
 msgid "Could not create aliases."
 msgstr "Nie można utworzyć aliasów."
 
@@ -6079,6 +6383,7 @@ msgid "User is not a member of group."
 msgstr "Użytkownik nie jest członkiem grupy."
 
 #: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
 msgid "Block user from group"
 msgstr "Zablokuj użytkownika w grupie"
 
@@ -6097,15 +6402,15 @@ msgstr ""
 msgid "Database error blocking user from group."
 msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie."
 
-#: actions/groupdesignsettings.php:73
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
 msgstr "Musisz być zalogowany, aby zmodyfikować grupę."
 
-#: actions/groupdesignsettings.php:146
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
 msgid "Group design"
 msgstr "WyglÄ…d grupy"
 
-#: actions/groupdesignsettings.php:157
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -6113,28 +6418,32 @@ msgstr "Dostosuj wygląd grupy za pomocą wybranego obrazu tła i palety koloró
 
 #: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
 #: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
 msgid "Couldn't update your design."
 msgstr "Nie można zaktualizować wyglądu."
 
 #: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
 msgid "Unable to save your design settings!"
 msgstr "Nie można zapisać ustawień wyglądu!"
 
 #: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
 msgid "Design preferences saved."
 msgstr "Zapisano preferencje wyglÄ…du."
 
-#: actions/groupmembers.php:438
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
 msgid "Make user an admin of the group"
 msgstr "Uczyń użytkownika administratorem grupy"
 
-#: actions/groupmembers.php:470
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
 msgid "Make Admin"
 msgstr "Uczyń administratorem"
 
-#: actions/groupmembers.php:470
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
 msgid "Make this user an admin"
 msgstr "Uczyń tego użytkownika administratorem"
 
@@ -6173,7 +6482,8 @@ msgstr "Użytkownik nie został zablokowany w grupie."
 msgid "Invites have been disabled."
 msgstr "Zaproszenia zostały wyłączone."
 
-#: actions/joingroup.php:100
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
 msgid "You have been blocked from that group by the admin."
 msgstr "Zostałeś zablokowany w tej grupie przez administratora."
 
@@ -6196,11 +6506,12 @@ msgstr "Nie można uzyskać wpisu członkostwa użytkownika %s w grupie %s"
 msgid "Can't make %s an admin for group %s"
 msgstr "Nie można uczynić %s administratorem grupy %s"
 
-#: actions/newmessage.php:178
+#: actions/newmessage.php:178 actions/newmessage.php:181
 msgid "Message sent"
 msgstr "Wysłano wiadomość"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6209,40 +6520,40 @@ msgstr ""
 "Serwer nie może obsłużyć aż tyle danych POST (%s bajty) z powodu bieżącej "
 "konfiguracji."
 
-#: actions/newnotice.php:128 scripts/maildaemon.php:185
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
 #, php-format
 msgid " Try using another %s format."
 msgstr " Spróbuj innego formatu %s."
 
-#: actions/newnotice.php:133 scripts/maildaemon.php:190
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
 #, php-format
 msgid "%s is not a supported filetype on this server."
 msgstr "%s nie jest obsługiwanym typem pliku na tym serwerze."
 
-#: actions/newnotice.php:205
+#: actions/newnotice.php:205 lib/mediafile.php:142
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Wysłany plik przekracza dyrektywę upload_max_filesize w php.ini."
 
-#: actions/newnotice.php:208
+#: actions/newnotice.php:208 lib/mediafile.php:147
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 "Wysłany plik przekracza dyrektywę MAX_FILE_SIZE podaną w formularzu HTML."
 
-#: actions/newnotice.php:211
+#: actions/newnotice.php:211 lib/mediafile.php:152
 msgid "The uploaded file was only partially uploaded."
 msgstr "Plik został tylko częściowo wysłany."
 
-#: actions/newnotice.php:214
+#: actions/newnotice.php:214 lib/mediafile.php:159
 msgid "Missing a temporary folder."
 msgstr "Brak folderu tymczasowego."
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:217 lib/mediafile.php:162
 msgid "Failed to write file to disk."
 msgstr "Zapisanie pliku na dysku nie powiodło się."
 
-#: actions/newnotice.php:220
+#: actions/newnotice.php:220 lib/mediafile.php:165
 msgid "File upload stopped by extension."
 msgstr "Wysłanie pliku zostało zatrzymane przez rozszerzenie."
 
@@ -6258,12 +6569,14 @@ msgstr "Maksymalny rozmiar wpisu to 140 znaków, w tym adres URL załącznika."
 msgid "Somehow lost the login in saveFile"
 msgstr "W jakiś sposób zgubiono login w saveFile"
 
-#: actions/newnotice.php:309 scripts/maildaemon.php:127
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
 msgid "File could not be moved to destination directory."
 msgstr "Nie można przenieść pliku do katalogu docelowego."
 
 #: actions/newnotice.php:336 actions/newnotice.php:360
-#: scripts/maildaemon.php:148 scripts/maildaemon.php:167
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr "Wystąpił błąd bazy danych podczas zapisywania pliku. Spróbuj ponownie."
 
@@ -6296,19 +6609,19 @@ msgstr ""
 "tego samego konta użytkownika. Tu można zarządzać powiązanymi "
 "identyfikatorami OpenID."
 
-#: actions/othersettings.php:110
+#: actions/othersettings.php:110 actions/othersettings.php:117
 msgid "Shorten URLs with"
 msgstr "Skracaj adresy URL za pomocÄ…"
 
-#: actions/othersettings.php:115
+#: actions/othersettings.php:115 actions/othersettings.php:122
 msgid "View profile designs"
 msgstr "Wyświetl ustawienia wyglądu profilu"
 
-#: actions/othersettings.php:116
+#: actions/othersettings.php:116 actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr "Wyświetl lub ukryj ustawienia wyglądu profilu."
 
-#: actions/public.php:82
+#: actions/public.php:82 actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)"
 msgstr "Poza ograniczeniem strony (%s)"
@@ -6334,7 +6647,7 @@ msgstr ""
 "Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
 "pierwszym, który coś wyśle!"
 
-#: actions/public.php:245
+#: actions/public.php:245 actions/public.php:238
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -6383,11 +6696,11 @@ msgstr "Przywrócenie hasła"
 msgid "Sorry, invalid invitation code."
 msgstr "Przepraszamy, nieprawidłowy kod zaproszenia."
 
-#: actions/remotesubscribe.php:100
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
 msgid "Subscribe to a remote user"
 msgstr "Zasubskrybuj zdalnego użytkownika"
 
-#: actions/replies.php:179
+#: actions/replies.php:179 actions/replies.php:198
 #, php-format
 msgid ""
 "This is the timeline showing replies to %s but %s hasn't received a notice "
@@ -6396,7 +6709,7 @@ msgstr ""
 "To jest oś czasu wyświetlająca odpowiedzi na wpisy użytkownika %s, ale %s "
 "nie otrzymał jeszcze wpisów wymagających jego uwagi."
 
-#: actions/replies.php:184
+#: actions/replies.php:184 actions/replies.php:203
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -6405,7 +6718,7 @@ msgstr ""
 "Możesz nawiązać rozmowę z innymi użytkownikami, zasubskrybować więcej osób "
 "lub [dołączyć do grup](%%action.groups%%)."
 
-#: actions/replies.php:186
+#: actions/replies.php:186 actions/replies.php:205
 #, php-format
 msgid ""
 "You can try to [nudge %s](../%s) or [post something to his or her attention]"
@@ -6419,7 +6732,7 @@ msgstr ""
 msgid "%s's favorite notices, page %d"
 msgstr "Ulubione wpisy użytkownika %s, strona %d"
 
-#: actions/showfavorites.php:170
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
 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."
@@ -6428,7 +6741,7 @@ msgstr ""
 "na wpisach, które chciałbyś dodać do zakładek na później lub rzucić na nie "
 "trochę światła."
 
-#: actions/showfavorites.php:172
+#: actions/showfavorites.php:172 actions/showfavorites.php:207
 #, php-format
 msgid ""
 "%s hasn't added any notices to his favorites yet. Post something interesting "
@@ -6448,30 +6761,31 @@ msgstr ""
 "[zarejestrujesz konta](%%%%action.register%%%%) i wyślesz coś "
 "interesującego, aby chcieli dodać to do swoich ulubionych. :)"
 
-#: actions/showfavorites.php:226
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
 msgid "This is a way to share what you like."
 msgstr "To jest sposób na współdzielenie tego, co chcesz."
 
 #: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
 msgid "Aliases"
 msgstr "Aliasy"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:328
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Kanał wpisów dla grupy %s (RSS 1.0)"
 
-#: actions/showgroup.php:330 actions/tag.php:84
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Kanał wpisów dla grupy %s (RSS 2.0)"
 
-#: actions/showgroup.php:337
+#: actions/showgroup.php:337 actions/showgroup.php:340
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Kanał wpisów dla grupy %s (Atom)"
 
-#: actions/showgroup.php:446
+#: actions/showgroup.php:446 actions/showgroup.php:454
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6484,7 +6798,7 @@ msgstr ""
 "narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
 "krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
 
-#: actions/showgroup.php:474
+#: actions/showgroup.php:474 actions/showgroup.php:482
 msgid "Admins"
 msgstr "Administratorzy"
 
@@ -6502,13 +6816,13 @@ msgstr " ze znacznikiem %s"
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr "Kanał wpisów dla %s ze znacznikiem %s (RSS 1.0)"
 
-#: actions/showstream.php:350
+#: actions/showstream.php:350 actions/showstream.php:444
 #, php-format
 msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 "To jest oś czasu dla użytkownika %s, ale %s nie nic jeszcze nie wysłał."
 
-#: actions/showstream.php:355
+#: actions/showstream.php:355 actions/showstream.php:449
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -6516,7 +6830,7 @@ msgstr ""
 "Widziałeś ostatnio coś interesującego? Nie wysłałeś jeszcze żadnych wpisów, "
 "teraz jest dobry czas, aby zacząć. :)"
 
-#: actions/showstream.php:357
+#: actions/showstream.php:357 actions/showstream.php:451
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6525,7 +6839,7 @@ msgstr ""
 "Możesz spróbować szturchnąć użytkownika %s lub [wysłać coś, co wymaga jego "
 "uwagi](%%%%action.newnotice%%%%?status_textarea=%s)."
 
-#: actions/showstream.php:393
+#: actions/showstream.php:393 actions/showstream.php:492
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6558,7 +6872,7 @@ msgstr ""
 "Użytkownik %s nie posiada subskrybentów. Dlaczego nie [zarejestrujesz konta]"
 "(%%%%action.register%%%%) i zostaniesz pierwszym?"
 
-#: actions/subscriptions.php:115
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6575,29 +6889,31 @@ msgstr ""
 "obserwujesz."
 
 #: actions/subscriptions.php:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "Użytkownik %s nie obserwuje nikogo."
 
-#: actions/tag.php:77
+#: actions/tag.php:77 actions/tag.php:86
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
 
-#: actions/tag.php:91
+#: actions/tag.php:91 actions/tag.php:98
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Kanał wpisów dla znacznika %s (Atom)"
 
-#: actions/twitapifavorites.php:125
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
 msgid "This status is already a favorite!"
 msgstr "Ten status jest już ulubiony!"
 
-#: actions/twitapifavorites.php:179
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite!"
 msgstr "Ten status nie jest ulubiony!"
 
 #: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
 msgid "Could not determine source user."
 msgstr "Nie można określić użytkownika źródłowego."
 
@@ -6605,16 +6921,17 @@ msgstr "Nie można określić użytkownika źródłowego."
 msgid "Target user not specified."
 msgstr "Nie podano użytkownika docelowego."
 
-#: actions/twitapifriendships.php:221
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
 msgid "Could not find target user."
 msgstr "Nie można znaleźć użytkownika docelowego."
 
-#: actions/twitapistatuses.php:322
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s/aktualizacje wspominajÄ…ce %2$s"
 
-#: actions/twitapitags.php:74
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Aktualizacje ze znacznikiem %1$s na %2$s!"
@@ -6623,11 +6940,11 @@ msgstr "Aktualizacje ze znacznikiem %1$s na %2$s!"
 msgid "Import my Friends Timeline."
 msgstr "Zaimportuj oś czasu przyjaciół."
 
-#: actions/userauthorization.php:158
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
 msgid "License"
 msgstr "Licencja"
 
-#: actions/userauthorization.php:179
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
 msgid "Reject this subscription"
 msgstr "Odrzuć tę subskrypcję"
 
@@ -6656,7 +6973,7 @@ msgstr "Użytkownik %s nie jest członkiem żadnej grupy."
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i dołączyć do nich."
 
-#: classes/File.php:127
+#: classes/File.php:127 classes/File.php:137
 #, php-format
 msgid ""
 "No file may be larger than %d bytes and the file you sent was %d bytes. Try "
@@ -6665,37 +6982,38 @@ msgstr ""
 "Żaden plik nie może być większy niż %d bajty, a wysłany plik miał %d bajty. "
 "Spróbuj wysłać mniejszą wersję."
 
-#: classes/File.php:137
+#: classes/File.php:137 classes/File.php:147
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 "Plik tej wielkości przekroczyłby przydział użytkownika wynoszący %d bajty."
 
-#: classes/File.php:145
+#: classes/File.php:145 classes/File.php:154
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 "Plik tej wielkości przekroczyłby miesięczny przydział użytkownika wynoszący %"
 "d bajty."
 
-#: classes/Notice.php:139
+#: classes/Notice.php:139 classes/Notice.php:179
 msgid "Problem saving notice. Too long."
 msgstr "Problem podczas zapisywania wpisu. Za długi."
 
-#: classes/User.php:319
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Witaj w %1$s, @%2$s!"
 
 #: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
 msgid "Design"
 msgstr "WyglÄ…d"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
 msgid "Design your profile"
 msgstr "WyglÄ…d profilu"
 
-#: lib/action.php:712
+#: lib/action.php:712 lib/action.php:727
 msgid "TOS"
 msgstr "TOS"
 
@@ -6784,15 +7102,15 @@ msgstr "Przywróć domyślne ustawienia"
 msgid "Save design"
 msgstr "Zapisz wyglÄ…d"
 
-#: lib/designsettings.php:378
+#: lib/designsettings.php:378 lib/designsettings.php:369
 msgid "Bad default color settings: "
 msgstr "Błędne domyślne ustawienia koloru: "
 
-#: lib/designsettings.php:474
+#: lib/designsettings.php:474 lib/designsettings.php:465
 msgid "Design defaults restored."
 msgstr "Przywrócono domyślny wygląd."
 
-#: lib/groupeditform.php:181
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
@@ -6923,15 +7241,15 @@ msgstr ""
 "rozmowę z innymi użytkownikami. Inni mogą wysyłać Ci wiadomości tylko dla "
 "Twoich oczu."
 
-#: lib/noticeform.php:154
+#: lib/noticeform.php:154 lib/noticeform.php:180
 msgid "Attach"
 msgstr "Załącz"
 
-#: lib/noticeform.php:158
+#: lib/noticeform.php:158 lib/noticeform.php:184
 msgid "Attach a file"
 msgstr "Załącz plik"
 
-#: lib/noticelist.php:436
+#: lib/noticelist.php:436 lib/noticelist.php:478
 msgid "in context"
 msgstr "w rozmowie"
 
@@ -6939,7 +7257,7 @@ msgstr "w rozmowie"
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: lib/searchaction.php:156
+#: lib/searchaction.php:156 lib/searchaction.php:162
 msgid "Search help"
 msgstr "Znajdź w pomocy"
 
@@ -6964,3 +7282,590 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
 "%s nie jest prawidłowym kolorem! Użyj trzech lub sześciu znaków "
 "szesnastkowych."
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Nie ma takiego znacznika."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Bezpośrednia wiadomość do użytkownika %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Wiadomość jest za długa. Maksymalna długość to 140 znaków."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Nie można obserwować użytkownika: nie znaleziono użytkownika."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "opis jest za długi (maksymalnie 140 znaków)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Jesteś już członkiem tej grupy"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Nie można dołączyć użytkownika %s do grupy %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Nie jesteś członkiem tej grupy."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Nie można usunąć użytkownika %s z grupy %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Grupy %s"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Grupy %s są członkiem"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Działania grupy"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Usunięto awatar."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Wpis jest za długi. Maksymalna długość to 140 znaków."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, fuzzy, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr "Maksymalny rozmiar wpisu to 140 znaków, w tym adres URL załącznika."
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Nieobsługiwany format pliku obrazu."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Zdjęcie"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "opis jest za długi (maksymalnie 140 znaków)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Aktualizacje od %1$s na %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Obserwowany użytkownik nie istnieje."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Brak upoważnienia."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Nieznana wersja protokołu OMB."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Nie ma takiego wpisu."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Utracono plik."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Aktualizacje od %1$s na %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Ta strona nie jest dostępna w "
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? "
+"[Zarejestruj](%%action.register%%) nowe konto lub wypróbuj [OpenID](%%action."
+"openidlogin%%). "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Aktualizacje ze znacznikiem %1$s na %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Wszystkie aktualizacje pasujÄ…ce do wyszukiwanego terminu \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Zawartość"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Opisz siÄ™ i swoje zainteresowania w 140 znakach"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Opisz siÄ™ i swoje "
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Wpis \"O mnie\" jest za długi (maksymalnie 140 znaków)."
+
+#: actions/register.php:336
+#, fuzzy
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+"Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
+"wpisy i połączyć się z przyjaciółmi i kolegami. (Posiadasz identyfikator "
+"[OpenID](http://openid.net/)? Wypróbuj [rejestracji OpenID](%%action."
+"openidlogin%%)!)"
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "To nie jest prawidłowy adres URL profilu (brak dokumentu YADIS)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "To jest profil lokalny! Zaloguj się, aby zasubskrybować."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Nie można uzyskać tokenu żądana."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Kanał wpisów dla %s (RSS 1.0)"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Kanał wpisów dla %s (RSS 2.0)"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Kanał wpisów dla %s (Atom)"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Wiadomość do użytkownika %1$s na %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Kanał dla znajomych użytkownika %s (RSS 1.0)"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Kanał dla znajomych użytkownika %s (RSS 2.0)"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Kanał dla znajomych użytkownika %s (Atom)"
+
+#: actions/showfavorites.php:211
+#, fuzzy, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+"Użytkownik %s nie dodał jeszcze żadnych wpisów do ulubionych. Dlaczego nie "
+"[zarejestrujesz konta](%%%%action.register%%%%) i wyślesz coś "
+"interesującego, aby chcieli dodać to do swoich ulubionych. :)"
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "FOAF dla %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Wysłano wpis"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Ta strona nie jest dostępna w "
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Sprawdź te szczegóły, aby upewnić się, czy na pewno chcesz zasubskrybować "
+"wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
+"naciśnij \"Odrzuć\"."
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"Subskrypcja została upoważniona, ale nie przekazano zwrotnego adresu URL. "
+"Sprawdź w instrukcjach strony, jak upoważnić subskrypcję. Token subskrypcji:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Subskrypcja została odrzucona, ale nie przekazano zwrotnego adresu URL. "
+"Sprawdź w instrukcjach strony, jak w pełni odrzucić subskrypcję."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Nie można odczytać adresu URL awatara \"%s\""
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Błędny typ obrazu dla \"%s\""
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Nie można przekierować do serwera: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Licencja oprogramowania StatusNet"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Nie można zaktualizować użytkownika z potwierdzonym adresem e-mail."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Wysłano szturchnięcie"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Wiadomość jest za długa - maksymalnie 140 znaków, wysłano %d"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Wiadomość jest za długa - maksymalnie 140 znaków, wysłano %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Odpowiedz na ten wpis"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problem podczas zapisywania wpisu."
+
+#: lib/command.php:587
+#, fuzzy
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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 ""
+"Polecenia:\n"
+"on - włącza powiadomienia\n"
+"off - wyłącza powiadomienia\n"
+"help - wyświetla tę pomoc\n"
+"follow <pseudonim> - subskrybuje użytkownika\n"
+"leave <pseudonim> - rezygnuje z subskrypcji użytkownika\n"
+"d <pseudonim> <tekst> - bezpośrednia wiadomość do użytkownika\n"
+"get <pseudonim> - uzyskuje ostatni wpis użytkownika\n"
+"whois <pseudonim> - uzyskuje informacje o profilu użytkownika\n"
+"fav <pseudonim> - dodaje ostatni wpis użytkownika jako \"ulubiony\"\n"
+"stats - uzyskuje Twoje statystyki\n"
+"stop - to samo co \"off\"\n"
+"quit - to samo co \"off\"\n"
+"sub <pseudonim> - to samo co \"follow\"\n"
+"unsub <pseudonim> - to samo co \"leave\"\n"
+"last <pseudonim> - to samo co \"get\"\n"
+"on <pseudonim> - jeszcze nie zaimplementowano.\n"
+"off <pseudonim> - jeszcze nie zaimplementowano.\n"
+"nudge <pseudonim> - jeszcze nie zaimplementowano.\n"
+"invite <numer telefonu> - jeszcze nie zaimplementowano.\n"
+"track <słowo> - jeszcze nie zaimplementowano.\n"
+"untrack <słowo> - jeszcze nie zaimplementowano.\n"
+"track off - jeszcze nie zaimplementowano.\n"
+"untrack all - jeszcze nie zaimplementowano.\n"
+"tracks - jeszcze nie zaimplementowano.\n"
+"tracking - jeszcze nie zaimplementowano.\n"
+
+#: lib/common.php:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Brak kodu potwierdzajÄ…cego."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Zaloguj siÄ™ na stronÄ™"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Wybierz operatora"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Opisz grupÄ™ lub temat w 140 znakach"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Opisz grupÄ™ lub temat w 140 znakach"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Brak identyfikatora wpisu"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "Użytkownik %s dodał Twój wpis jako ulubiony"
+
+#: lib/mail.php:556
+#, fuzzy, 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 ""
+"%1$s właśnie dodał Twój wpis z %2$s jako jeden ze swoich ulubionych.\n"
+"\n"
+"Adres URL Twojego wpisu:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Tekst Twojego wpisu:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Tutaj możesz zobaczyć listę ulubionych wpisów użytkownika %1$s:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Z poważaniem,\n"
+"%6$s\n"
+
+#: lib/mail.php:611
+#, fuzzy, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr "Użytkownik %s wysłał wpis wymagający Twojej uwagi"
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " z "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Nie można określić użytkownika źródłowego."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Usuń wpis"
diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo
index e6168a340..a2086783a 100644
--- a/locale/pt/LC_MESSAGES/statusnet.mo
+++ b/locale/pt/LC_MESSAGES/statusnet.mo
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 779d7489e..076e71545 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,3 +1,6 @@
+# Translation of StatusNet to Portuguese
+#
+# --
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -5,26 +8,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-05-28 14:56+0000\n"
-"Last-Translator: Rui de Brito Mendes <rbritomendes@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:22+0000\n"
+"Language-Team: Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Procurar por \"%s\" no fluxo de mensagens"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -37,17 +41,19 @@ msgid " from "
 msgstr "de"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Actualizações em resposta a %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s convidou-o a juntar-se a ele no %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -104,6 +110,7 @@ msgstr ""
 "Sinceramente, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
@@ -126,25 +133,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Updates de %1$s como resposta às actualizações de %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s's estado em %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "Fluxo Público de %s"
@@ -154,34 +164,48 @@ msgstr "Fluxo Público de %s"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Mensagens públicas de %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "Estado de %s"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Mensagens de %s"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s actualizações de todos!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -189,7 +213,8 @@ msgstr ""
 "(Deverá receber uma mensagem por email dentro de momentos, com instrucções "
 "sobre como confirmar o seu endereço de email.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -198,7 +223,8 @@ msgstr ""
 "**%%site.name%%*** é um serviço de microblogging trazido até sí por [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** é um serviço de microblogging. "
@@ -210,30 +236,34 @@ msgstr ". Os colaboradores devem ser citados usando nome completo ou apelido."
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1-64 letras ou números, sem pontuação ou espaços. Obrigatório."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 ou mais caracteres"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 ou mais caracteres, e não a esqueça!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 ou mais caracteres. Obrigatório."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -243,6 +273,7 @@ msgstr ""
 "aprovar que %s envie mensagens para sí."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -278,7 +309,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Método da API não encontrado!"
 
@@ -301,16 +359,23 @@ msgstr "Método da API não encontrado!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "Método da API em construcção."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Sobre"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Aceitar"
 
@@ -321,6 +386,9 @@ msgstr "Aceitar"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Adicionar"
 
@@ -338,27 +406,29 @@ msgstr "Adicionar ou remover OpenID"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Endereço"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Endereços dos amigos a convidar (um por linha)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Todas as subscrições"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Todas as actualizações de %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Todas as actualizações com o termo \"%s\""
@@ -368,31 +438,38 @@ msgstr "Todas as actualizações com o termo \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Login já efectuado."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Já subscrito!."
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Tem a certeza que permite remover esta mensagem?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorizar subscrição"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Efectuar login automático; não utilizar em computadores de uso partilhado!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -402,15 +479,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -420,6 +501,7 @@ msgstr ""
 "para a sua conta de Jabber/GTalk. (Adicionou %s à sua lista de amigos?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -428,7 +510,7 @@ msgstr ""
 "caixa de spam) pela mensagem com as instrucções."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "A aguardar confirmação deste número de telefone."
 
@@ -440,6 +522,8 @@ msgstr "Antes »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Bio"
 
@@ -447,16 +531,18 @@ msgstr "Bio"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Bio é demasiada extensa (máx 140 car)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Não é possível remover a mensagem."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Não é possível ler o URL do avatar '%s'"
@@ -464,6 +550,8 @@ msgstr "Não é possível ler o URL do avatar '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Não é possível guardar a nova password."
 
@@ -471,31 +559,34 @@ msgstr "Não é possível guardar a nova password."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Não é possível instanciar um objecto do OpenID."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Não é possível normalizar esse ID de Jabber"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Não é possível normalizar esse endereço de email"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Modificar"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Alterar email handling"
 
@@ -505,11 +596,12 @@ msgid "Change password"
 msgstr "Modificar palavra-passe"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Modificar a sua palavra-passe"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Modificar as suas definições de perfil"
 
@@ -519,6 +611,9 @@ msgstr "Modificar as suas definições de perfil"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -531,12 +626,14 @@ msgstr "Confirmar Endereço"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Confirmação cancelada."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Código de confirmação"
 
@@ -545,7 +642,8 @@ msgstr "Código de confirmação"
 msgid "Confirmation code not found."
 msgstr "Código de confirmação não encontrado"
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -578,20 +676,24 @@ msgstr ""
 "Obrigado por se registar e esperamos que se divirta usando este serviço."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Ligar"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Ligar conta existente"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Não foi possível criar o formulário de OpenID: %s"
@@ -599,35 +701,39 @@ msgstr "Não foi possível criar o formulário de OpenID: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Não foi possível seguir utilizador: %s já está na sua lista."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Não foi possível redireccionar para o servidor: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Não foi possível guardar a info do avatar "
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Não foi possível guardar a nova info do perfil"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Não foi possível subscrever outros a si."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Não foi possível subscrever. "
 
@@ -640,7 +746,8 @@ msgstr ""
 #: ../actions/finishremotesubscribe.php:99
 #: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
-msgstr "Não foi possível converter os tokens de requisição em tokens de acesso."
+msgstr ""
+"Não foi possível converter os tokens de requisição em tokens de acesso."
 
 #: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
@@ -648,15 +755,17 @@ msgstr "Não foi possível converter os tokens de requisição em tokens de aces
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Não foi possível apagar a confirmação do email."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Não foi possível apagar a subscrição."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Não foi possivel encontrar algum estado."
 
@@ -669,29 +778,38 @@ msgstr "Não foi possível obter um token de requisição."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Não foi possível inserir o código de confirmação."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir nova subscrição."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Não foi possível salvar o perfil."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Não foi possível actualizar o utilizador para auto-subscrição."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Não foi possível actualizar o registo do utilizador."
 
@@ -707,42 +825,48 @@ msgstr "Não foi possível actualizar o registo do utilizador."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Não foi possível actualizar o utilizador."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Criar"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Criar um novo utilizador com esta alcunha."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Criar nova conta"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Criar nova conta para OpenID que já possui um utilizador."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Endereço do Jabber/GTalk já confirmado."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de telefone com serviço SMS activo já confirmado."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Endereço de email já confirmado."
 
@@ -751,23 +875,27 @@ msgid "Currently"
 msgstr "Actualmente"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Ocorreu um erro na base de dados ao inserir a hashtag: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Apagar mensagem"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Descreva-se e aos seus interesses em 140 caracteres"
 
@@ -775,11 +903,13 @@ msgstr "Descreva-se e aos seus interesses em 140 caracteres"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Email"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Endereço de Email"
 
@@ -789,39 +919,43 @@ msgid "Email Settings"
 msgstr "Definições do Email"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Endereço de Email já existe."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmação do Endereço de Email"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Endereço de Email, como \"nomedeutilizador@exemplo.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Endereços de Email"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Introduza uma alcunha ou um endereço de email"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Introduza o código que recebeu no seu telefone."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Erro ao autorizar token"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Erro ao ligar utilizador ao OpenID."
 
@@ -832,39 +966,46 @@ msgstr "Erro ao ligar utilizador."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Erro ao inserir avatar"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Erro ao inserir novo perfil"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Erro ao inserir perfil remoto"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Erro ao guardar confirmação do endereço."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Erro ao guardar perfil remoto"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Erro ao guardar o perfil."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Erro ao guardar o utilizador."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Erro ao guardar utilizador; inválido."
 
@@ -873,6 +1014,9 @@ msgstr "Erro ao guardar utilizador; inválido."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Erro ao configurar utilizador."
 
@@ -883,6 +1027,7 @@ msgstr "Erro ao actualizar o perfil."
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Erro ao actualizar o perfil remoto"
 
@@ -892,33 +1037,36 @@ msgid "Error with confirmation code."
 msgstr "Erro no código de confirmação."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Alcunha já existente"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Falha ao actualizar avatar."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed para os amigos de %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed para as respostas a %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Feed para a tag %s"
@@ -933,7 +1081,7 @@ msgstr "Encontrar conteúdo dos mensagens"
 msgid "Find people on this site"
 msgstr "Encontrar pessoas neste site"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -946,6 +1094,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Nome Completo"
 
@@ -954,23 +1107,33 @@ msgstr "Nome Completo"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nome completo é demasiado longo (máx. 255 caracteres)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Ajuda"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Início"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Página Principal"
 
@@ -978,21 +1141,27 @@ msgstr "Página Principal"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "A Homepage inserida não é um URL válido."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Quero postar mensagens por email."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Endereço IM"
 
@@ -1002,7 +1171,7 @@ msgid "IM Settings"
 msgstr "Definições de IM"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1010,7 +1179,7 @@ msgstr ""
 "Se já tem uma conta, inicie sessão com o seu nome de utilizador e palavra-"
 "passe para a ligar ao seu OpenID."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1018,7 +1187,7 @@ msgstr ""
 "Se quiser adicionar um OpenID à sua conta, introduza-o na caixa a baixo e "
 "clique em \"Adicionar\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1030,25 +1199,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Email a receber"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "O endereço de email de recepção removido."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Palavra-passe antiga incorrecta"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Nome de utilizador ou palavra-passe incorrecta"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1057,30 +1232,31 @@ msgstr ""
 "endereço de email registado na sua conta."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "URL do avatar inválido '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Endereço de email inválido: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Página principal inválida '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "URL de licença inválido '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Conteúdo da mensagem inválido"
 
@@ -1095,13 +1271,13 @@ msgid "Invalid notice url"
 msgstr "URL da mensagem inválido"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "URL do perfil inválido '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "URL de perfil inválido (formato incorrecto)"
 
@@ -1119,28 +1295,35 @@ msgstr "Tamanho inválido."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nome de utilizador ou palavra-passe inválido."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Contive(s) enviado(s)"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Convite(s) enviado(s) para as seguintes pessoas:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Convidar"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Convidar novos utilizadores"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1149,11 +1332,12 @@ msgid ""
 msgstr ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "O Jabber ID introduzido já pertence a outro utilizador."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1161,12 +1345,14 @@ msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Linguagem"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Linguagem introduzida é muito longa (máx. 50 caracteres)."
 
@@ -1175,7 +1361,15 @@ msgstr "Linguagem introduzida é muito longa (máx. 50 caracteres)."
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Localidade"
 
@@ -1184,7 +1378,12 @@ msgstr "Localidade"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Localidade é muito longa (máx. 255 caracteres)."
 
@@ -1193,18 +1392,22 @@ msgstr "Localidade é muito longa (máx. 255 caracteres)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Entrar"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Entrar com conta [OpenID](%%doc.openid%%)"
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1212,25 +1415,29 @@ msgid ""
 "%). "
 msgstr ""
 "Entrar com o seu nome de utilizador e palavra passe. Não está registado "
-"ainda?[Registe-se](%%action.register%%), ou tente entrar com "
-"[OpenID](%%action.openidlogin%%). "
+"ainda?[Registe-se](%%action.register%%), ou tente entrar com [OpenID](%%"
+"action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Sair"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu-se da palavra-passe?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -1241,16 +1448,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Membro desde"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog por %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1260,42 +1469,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr ""
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Novo"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Nova alcunha"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr ""
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nova palavra-passe"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nova palavra-passe foi guardada com sucesso. Está agora conectado."
 
@@ -1305,7 +1522,13 @@ msgstr "Nova palavra-passe foi guardada com sucesso. Está agora conectado."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Alcunha"
 
@@ -1314,7 +1537,12 @@ msgstr "Alcunha"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Alcunha já em uso. Tente outra diferente."
 
@@ -1323,47 +1551,58 @@ msgstr "Alcunha já em uso. Tente outra diferente."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Alcunha só deve conter letras minúsculas e números. Sem espaços."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Alcunha não permitida."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Alcunha do utilizador que pretende seguir"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Alcunha ou email"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "Não"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr ""
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr ""
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr ""
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Nenhum código introduzido"
 
@@ -1375,11 +1614,15 @@ msgstr ""
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr ""
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr ""
 
@@ -1388,7 +1631,9 @@ msgid "No id."
 msgstr ""
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr ""
 
@@ -1399,6 +1644,7 @@ msgstr "Nenhuma alcunha fornecida pelo servidor remoto."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Nenhuma alcunha."
 
@@ -1406,12 +1652,14 @@ msgstr "Nenhuma alcunha."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmação pendente para cancelar."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Nenhum numero de telefone."
 
@@ -1421,7 +1669,8 @@ msgid "No profile URL returned by server."
 msgstr ""
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Nenhum endereço de email registado para esse utilizador."
 
@@ -1433,7 +1682,7 @@ msgstr "Nenhum pedido encontrado!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Nenhum resultado"
 
@@ -1444,12 +1693,16 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Nenhum estado encontrado com esse ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Nenhum estado com esse ID encontrado."
 
@@ -1459,13 +1712,15 @@ msgid "No such OpenID."
 msgstr ""
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr ""
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr ""
 
@@ -1503,12 +1758,22 @@ msgstr ""
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr ""
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr ""
 
@@ -1522,32 +1787,38 @@ msgid "Not a recovery code."
 msgstr ""
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr ""
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr ""
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr ""
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr ""
 
@@ -1555,6 +1826,11 @@ msgstr ""
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1574,7 +1850,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr ""
 
@@ -1585,11 +1862,13 @@ msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr ""
 
@@ -1605,11 +1884,15 @@ msgstr ""
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr ""
 
@@ -1626,39 +1909,44 @@ msgid "Notice feed for %s"
 msgstr ""
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr ""
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr ""
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr ""
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr ""
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr ""
 
@@ -1666,29 +1954,34 @@ msgstr ""
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr ""
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr ""
@@ -1704,11 +1997,12 @@ msgid "OpenID settings"
 msgstr ""
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr ""
 
@@ -1718,34 +2012,46 @@ msgstr ""
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr ""
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr ""
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr ""
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr ""
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr ""
 
@@ -1765,14 +2071,17 @@ msgid "People search"
 msgstr ""
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr ""
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr ""
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
@@ -1784,7 +2093,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
@@ -1793,7 +2102,9 @@ msgstr ""
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr ""
 
@@ -1802,42 +2113,52 @@ msgstr ""
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr ""
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr ""
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr ""
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr ""
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr ""
 
@@ -1846,17 +2167,19 @@ msgid "Public Stream Feed"
 msgstr ""
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr ""
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1866,12 +2189,14 @@ msgid "Recent Tags"
 msgstr ""
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr ""
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr ""
 
@@ -1884,37 +2209,45 @@ msgstr ""
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr ""
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr ""
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr ""
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr ""
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr ""
 
@@ -1928,6 +2261,9 @@ msgstr ""
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr ""
 
@@ -1936,41 +2272,48 @@ msgstr ""
 msgid "Remove OpenID"
 msgstr ""
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr ""
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr ""
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr ""
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr ""
 
@@ -1979,17 +2322,18 @@ msgstr ""
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr ""
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2002,12 +2346,21 @@ msgstr ""
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr ""
 
@@ -2017,14 +2370,14 @@ msgid "Search Stream Feed"
 msgstr ""
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 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 ""
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2032,48 +2385,56 @@ msgid ""
 msgstr ""
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr ""
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr ""
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr ""
 
@@ -2093,27 +2454,32 @@ msgid "Something weird happened."
 msgstr ""
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr ""
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr ""
 
@@ -2121,24 +2487,28 @@ msgstr ""
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr ""
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr ""
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr ""
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr ""
 
@@ -2146,28 +2516,35 @@ msgstr ""
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr ""
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr ""
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr ""
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr ""
 
@@ -2187,6 +2564,7 @@ msgid "That confirmation code is not for you!"
 msgstr ""
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr ""
 
@@ -2196,63 +2574,73 @@ msgid "That file is too big."
 msgstr ""
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr ""
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
@@ -2261,18 +2649,22 @@ msgstr ""
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr ""
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2280,40 +2672,45 @@ msgid ""
 msgstr ""
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr ""
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2325,6 +2722,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
@@ -2333,25 +2733,37 @@ msgstr ""
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2360,18 +2772,21 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
@@ -2383,15 +2798,22 @@ msgstr ""
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr ""
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr ""
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr ""
 
@@ -2420,38 +2842,47 @@ msgstr ""
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr ""
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr ""
 
@@ -2468,12 +2899,15 @@ msgid "Upload a new profile image"
 msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
@@ -2497,11 +2931,16 @@ msgstr ""
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr ""
 
@@ -2510,29 +2949,33 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
@@ -2540,7 +2983,9 @@ msgstr ""
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr ""
 
@@ -2561,11 +3006,12 @@ msgid "You are already logged in!"
 msgstr ""
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2583,20 +3029,22 @@ msgstr ""
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2605,21 +3053,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2633,82 +3083,96 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr ""
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr ""
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr ""
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr ""
 
@@ -2730,12 +3194,14 @@ msgid "reply"
 msgstr ""
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr ""
 
@@ -2756,6 +3222,26 @@ msgstr ""
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2764,6 +3250,7 @@ msgid "This notice is not a favorite!"
 msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -2771,22 +3258,28 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2796,11 +3289,13 @@ msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2840,33 +3335,44 @@ msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr ""
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr ""
 
@@ -2920,6 +3426,11 @@ msgstr ""
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr ""
 
@@ -2948,6 +3459,8 @@ msgid "New password successfully saved. "
 msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2968,12 +3481,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2981,7 +3497,7 @@ msgstr ""
 msgid "No such message."
 msgstr ""
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
@@ -3005,51 +3521,70 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
@@ -3068,14 +3603,17 @@ msgid ""
 msgstr ""
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr ""
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr ""
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -3084,6 +3622,7 @@ msgid "Twitter Username"
 msgstr ""
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr ""
 
@@ -3092,24 +3631,29 @@ msgid "Twitter Password"
 msgstr ""
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -3120,33 +3664,43 @@ msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -3163,18 +3717,19 @@ msgid "The subscription has been rejected, but no "
 msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3184,89 +3739,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3274,11 +3851,11 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3293,7 +3870,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -3305,7 +3882,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3314,31 +3891,39 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr ""
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr ""
 
@@ -3351,14 +3936,19 @@ msgid "Twitter integration options"
 msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s e amigos"
@@ -3368,21 +3958,31 @@ msgid "You can upload your personal avatar."
 msgstr ""
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr ""
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
@@ -3399,34 +3999,43 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr ""
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr ""
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr ""
 
@@ -3434,11 +4043,11 @@ msgstr ""
 msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr ""
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3456,38 +4065,56 @@ msgstr "Tem a certeza que permite remover esta mensagem?"
 msgid "Add to favorites"
 msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr ""
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr ""
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3496,15 +4123,16 @@ msgid "Nickname must have only lowercase letters "
 msgstr ""
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "Bio é demasiada extensa (máx 140 car)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr ""
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr ""
 
@@ -3521,7 +4149,8 @@ msgstr ""
 msgid "Send me email when someone "
 msgstr ""
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3536,7 +4165,7 @@ msgstr ""
 "Um código de confirmação foi enviado para o endereço fornecido. Tem que "
 "aprovar que %s envie mensagens para sí."
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3550,52 +4179,67 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr ""
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr ""
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "Antes »"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3637,12 +4281,14 @@ msgstr ""
 msgid "Sync preferences"
 msgstr ""
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr ""
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr ""
 
@@ -3656,7 +4302,8 @@ msgid "The most popular notices on the site right now."
 msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3670,15 +4317,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr ""
 
@@ -3686,12 +4335,14 @@ msgstr ""
 msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "Avatar actualizado."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr ""
 
@@ -3710,7 +4361,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
@@ -3725,6 +4377,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr ""
 
@@ -3734,7 +4387,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr ""
 
@@ -3756,20 +4409,20 @@ msgstr ""
 msgid "A confirmation code was sent "
 msgstr "Código de confirmação não encontrado"
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr ""
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr ""
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr ""
@@ -3778,15 +4431,18 @@ msgstr ""
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr ""
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr ""
 
@@ -3794,21 +4450,25 @@ msgstr ""
 msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr ""
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr ""
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -3820,15 +4480,17 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr ""
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr ""
 
@@ -3840,11 +4502,14 @@ msgstr ""
 msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr ""
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr ""
 
@@ -3861,7 +4526,7 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr ""
 
@@ -3885,11 +4550,13 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr ""
 
@@ -3898,16 +4565,17 @@ msgstr ""
 msgid "Change your password."
 msgstr "Modificar a sua palavra-passe"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr ""
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr ""
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -3917,11 +4585,12 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr ""
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -3934,20 +4603,25 @@ msgstr ""
 "humanos)"
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr ""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr ""
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "Mensagens públicas de %s"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
@@ -3967,11 +4641,13 @@ msgstr ""
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4024,7 +4700,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr ""
@@ -4034,50 +4711,71 @@ msgstr ""
 msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr ""
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr ""
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr ""
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr ""
 
@@ -4092,7 +4790,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4102,31 +4800,38 @@ msgid "'s profile"
 msgstr ""
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr ""
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr ""
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr ""
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "Todas as subscrições"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr ""
 
@@ -4151,7 +4856,7 @@ msgstr ""
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "A aguardar confirmação deste número de telefone."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr ""
 
@@ -4209,16 +4914,17 @@ msgstr ""
 msgid "These are the people whose "
 msgstr ""
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr ""
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr ""
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4240,7 +4946,7 @@ msgstr ""
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4250,16 +4956,16 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr ""
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4267,20 +4973,23 @@ msgstr ""
 msgid "No such tag."
 msgstr ""
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr ""
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr ""
 
@@ -4288,15 +4997,16 @@ msgstr ""
 msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr ""
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr ""
 
@@ -4309,146 +5019,155 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr ""
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr ""
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr ""
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr ""
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr ""
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr ""
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr ""
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Account"
 msgstr "Sobre"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "Modificar a sua palavra-passe"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "Ligar conta existente"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr ""
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr ""
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr ""
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr ""
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr ""
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr ""
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Bloquear"
 
@@ -4461,11 +5180,14 @@ msgstr ""
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr ""
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr ""
 
@@ -4486,32 +5208,37 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
 msgstr "Todas as subscrições"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr ""
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
@@ -4520,20 +5247,20 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr ""
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
@@ -4563,11 +5290,11 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr ""
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr ""
 
@@ -4587,24 +5314,24 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr ""
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr ""
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
@@ -4619,43 +5346,51 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 #, fuzzy
 msgid "From"
 msgstr "de"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 ou mais caracteres"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr ""
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Não é possível remover a mensagem."
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Não é possível remover a mensagem."
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr ""
 
@@ -4676,27 +5411,29 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr ""
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr ""
 
@@ -4712,31 +5449,33 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Já subscrito!."
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "O utilizador bloqueou-o."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Subscrever este utilizador"
 
@@ -4749,13 +5488,1985 @@ msgid "Top posters"
 msgstr "Top posters"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Desbloquear este utilizador"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Desbloquear"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Des-Subscrever deste utilizador"
+
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s e amigos"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar actualizado."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr "Tem a certeza que permite remover esta mensagem?"
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Microblog por %s"
+
+#: actions/groupsearch.php:57 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 ""
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Procurar por \"%s\" no fluxo de mensagens"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Por razões de segurança, por favor reintroduza o seu nome de utilizador e "
+"palavra-passe antes de alterar as suas configurações."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr ""
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr ""
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Fluxo Público de %s"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"excepto estes dados privados: palavra chave, endereço de email, endereço de "
+"mensageiro instantâneo, número de telefone."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Criar"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+msgid "Your profile"
+msgstr ""
+
+#: actions/showstream.php:149
+#, php-format
+msgid "%s's profile"
+msgstr ""
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr ""
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Feed para a tag %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Modificar as suas definições de perfil"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Um código de confirmação foi enviado para o número de telefone fornecido. "
+"Procure na sua 'Caixa de Entrada' (e caixa de spam) pelo email com o código "
+"e instrucções de utilização."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+msgid "No such user!"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr ""
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+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/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"Se já tem uma conta, inicie sessão com o seu nome de utilizador e palavra-"
+"passe para a ligar ao seu OpenID."
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s está agora a ouvir os seus comunicados em %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Sinceramente,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+msgid "Search site"
+msgstr ""
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr ""
+
+#: actions/block.php:149
+msgid "Do not block this user from this group"
+msgstr ""
+
+#: actions/block.php:150
+msgid "Block this user from this group"
+msgstr ""
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr ""
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s e amigos"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Desbloquear este utilizador"
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Código de confirmação"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Não é possível remover a mensagem."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Endereço de email inválido: %s"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Alcunha já em uso. Tente outra diferente."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Não foi possível criar o formulário de OpenID: %s"
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "URI da mensagem inválido"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nenhuma alcunha."
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+msgid "Not a valid invitation code."
+msgstr ""
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "O utilizador bloqueou-o."
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr ""
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr ""
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Não foi possível actualizar o utilizador."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+msgid "Design preferences saved."
+msgstr ""
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Nenhum resultado"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "O utilizador bloqueou-o."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+msgid "Message sent"
+msgstr ""
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Não foi possível salvar o perfil."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+msgid "View profile designs"
+msgstr ""
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Se você se esqueceu ou perdeu a sua palavra-passe, você pode receber uma "
+"nova que será enviada para o endereço de email que tem configurado na sua "
+"conta."
+
+#: actions/recoverpassword.php:158
+msgid "You've been identified. Enter a new password below. "
+msgstr ""
+
+#: actions/recoverpassword.php:188
+msgid "Password recover"
+msgstr ""
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Erro no código de confirmação."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Subscrever este utilizador"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s e amigos"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr ""
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr ""
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+msgid "Not a local notice"
+msgstr ""
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:121
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
+
+#: actions/tag.php:77 actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed para a tag %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Não foi possível actualizar o utilizador."
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Não foi possivel encontrar algum estado."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Actualizações em resposta a %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr ""
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Todas as subscrições"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr ""
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr ""
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+msgid "Problem saving notice. Too long."
+msgstr ""
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+msgid "Design your profile"
+msgstr ""
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr ""
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr ""
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Modificar a sua palavra-passe"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Ligar"
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Entrar"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Bloquear"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Desbloquear este utilizador"
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+msgid "in context"
+msgstr ""
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+msgid "Search help"
+msgstr ""
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "A Homepage inserida não é um URL válido."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr ""
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Bio é demasiada extensa (máx 140 car)."
+
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr ""
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
+
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr ""
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
+
+#: actions/apigrouplist.php:95
+#, php-format
+msgid "%s's groups"
+msgstr ""
+
+#: actions/apigrouplist.php:103
+#, php-format
+msgid "Groups %s is a member of on %s."
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar actualizado."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr ""
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Bio é demasiada extensa (máx 140 car)."
+
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr ""
+"Não foi possível converter os tokens de requisição em tokens de acesso."
+
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr ""
+
+#: actions/getfile.php:75
+msgid "No such file."
+msgstr ""
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Não foi possível salvar o perfil."
+
+#: actions/grouprss.php:133
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr ""
+
+#: actions/imsettings.php:89
+msgid "IM is not available."
+msgstr ""
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Entrar com o seu nome de utilizador e palavra passe. Não está registado "
+"ainda?[Registe-se](%%action.register%%), ou tente entrar com [OpenID](%%"
+"action.openidlogin%%). "
+
+#: actions/noticesearchrss.php:89
+#, php-format
+msgid "Updates with \"%s\""
+msgstr ""
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Todas as actualizações com o termo \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Ligar"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Descreva-se e aos seus interesses em 140 caracteres"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Descreva-se e aos seus interesses em 140 caracteres"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Bio é demasiada extensa (máx 140 car)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no 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 "Não foi possível obter um token de requisição."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed para a tag %s"
+
+#: actions/repliesrss.php:72
+#, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr ""
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Feed para a tag %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Avatar actualizado."
+
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr ""
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed para a tag %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: 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:249
+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:261
+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:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Não é possível ler o URL do avatar '%s'"
+
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr ""
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Não foi possível redireccionar para o servidor: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Encontrar conteúdo dos mensagens"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr ""
+"Não foi possivel actualizar utilizador com endereço de email confirmado."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Não é possível remover a mensagem."
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Erro ao guardar o utilizador."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Código de confirmação não encontrado"
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr ""
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "URI da mensagem inválido"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "de"
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Não foi possível actualizar o utilizador."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Apagar mensagem"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo
index a5a6f2725..4cf5ea13c 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.mo
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.mo
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 7fae3f5f3..41a6d08cd 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -1,32 +1,32 @@
 # Translation of StatusNet to Brazilian Portuguese
+#
+# Author@translatewiki.net: Ewout
+# --
 # Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: statusnet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-07-14 11:24+0000\n"
-"Last-Translator: Jose Martinho <martinho.com@gmail.com>\n"
-"Language-Team: Português do Brasil\n"
-"MIME-Version: 1.0\n"
+""
+"Project-Id-Version: StatusNet\n"
+"PO-Revision-Date: 2009-11-06 12:24:14+0000\n"
+"Language-Team: Brazilian Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58634); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt-br\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Procurar por \"%s\" no fluxo de mensagens"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-" exceto estes dados privados: senha, endereço de e-mail, endereço de IM, "
-"número de telefone."
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
+msgid " except this private data: password, email address, IM address, phone number."
+msgstr " exceto estes dados privados: senha, endereço de e-mail, endereço de IM, número de telefone."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
@@ -34,116 +34,57 @@ msgid " from "
 msgstr " de "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Atualizações respondendo à %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s convidou você para se juntar ao %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, 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 convidou você para se juntar ao %2$s (%3$s).\n"
-"\n"
-"%2$s é um serviço de microblogagem que lhe permite manter-se atualizado com "
-"as pessoas que você conhece e com as que lhe interessam.\n"
-"\n"
-"Você também pode compartilhar notícias sobre você mesmo, seus pensamentos, "
-"ou sua vida on-line com as pessoas que lhe conhecem. Também é ótimo para "
-"encontrar novas pessoas que compartilham os mesmos interesses que você.\n"
-"\n"
-"%1$s disse:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Você pode ver o perfil de %1$s no %2$s aqui:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Se você quiser experimentar o serviço, clique no link abaixo para aceitar o "
-"convite.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Se não, você pode ignorar esta mensagem. Obrigado por sua paciência e seu "
-"tempo.\n"
-"\n"
-"Cordialmente, %2$s\n"
+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\nYou 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\nYou can see %1$s's profile page on %2$s here:\n\n%5$s\n\nIf you'd like to try the service, click on the link below to accept the invitation.\n\n%6$s\n\nIf not, you can ignore this message. Thanks for your patience and your time.\n\nSincerely, %2$s\n"
+msgstr "%1$s convidou você para se juntar ao %2$s (%3$s).\n\n%2$s é um serviço de microblogagem que lhe permite manter-se atualizado com as pessoas que você conhece e com as que lhe interessam.\n\nVocê também pode compartilhar notícias sobre você mesmo, seus pensamentos, ou sua vida on-line com as pessoas que lhe conhecem. Também é ótimo para encontrar novas pessoas que compartilham os mesmos interesses que você.\n\n%1$s disse:\n\n%4$s\n\nVocê pode ver o perfil de %1$s no %2$s aqui:\n\n%5$s\n\nSe você quiser experimentar o serviço, clique no link abaixo para aceitar o convite.\n\n%6$s\n\nSe não, você pode ignorar esta mensagem. Obrigado por sua paciência e seu tempo.\n\nCordialmente, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s agora está acompanhando suas mensagens em %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-msgstr ""
-"%1$s agora está acompanhando suas mensagens em %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Cordialmente,\n"
-"%4$s.\n"
+msgid "%1$s is now listening to your notices on %2$s.\n\n	%3$s\n\nFaithfully yours,\n%4$s.\n"
+msgstr "%1$s agora está acompanhando suas mensagens em %2$s.\n\n	%3$s\n\nCordialmente,\n%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s atualizações que respondem a mensagens de %2$s / %3$s."
 
-#  Apesar do termo em inglês ser status, na verdade ele refere-se a uma determinada mensagem.
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Mensagem de %1$s em %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "Fluxo Público de %s"
@@ -153,113 +94,110 @@ msgstr "Fluxo Público de %s"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Mensagens públicas de %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "Status de %s"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Mensagens de %s"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s atualizações de todo mundo!"
 
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-"(Você receberá uma mensagem por e-mail a qualquer momento, com instruções "
-"sobre como confirmar seu endereço.)"
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
+msgid "(You should receive a message by email momentarily, with instructions on how to confirm your email address.)"
+msgstr "(Você receberá uma mensagem por e-mail a qualquer momento, com instruções sobre como confirmar seu endereço.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-"**%%site.name%%** é um serviço de microblogagem disponibilizado por [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+msgid "**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgstr "**%%site.name%%** é um serviço de microblogagem disponibilizado por [%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** é um serviço de microblogagem. "
 
 #: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
-". Os colaboradores devem ser citados usando seu nome completo ou apelido."
+msgstr ". Os colaboradores devem ser citados usando seu nome completo ou apelido."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
+msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "No mínimo 6 caracteres"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "No mínimo 6 caracteres. E não se esqueça dela!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "No mínimo 6 caracteres. Obrigatório."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-"Um código de confirmação foi enviado para o endereço de IM que você "
-"informou. Você deve permitir que %s envie mensagens para você."
+msgid "A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you."
+msgstr "Um código de confirmação foi enviado para o endereço de IM que você informou. Você deve permitir que %s envie mensagens para você."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-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 ""
-"Um código de confirmação foi enviado para o endereço de e-mail que você "
-"informou. Verifique a sua caixa de entrada (e de spam!) para o código e "
-"instruções sobre como usá-lo."
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
+msgid "A confirmation code was sent to the email address you added. Check your inbox (and spam box!) for the code and instructions on how to use it."
+msgstr "Um código de confirmação foi enviado para o endereço de e-mail que você informou. Verifique a sua caixa de entrada (e de spam!) para o código e instruções sobre como usá-lo."
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Um código de confirmação foi enviado para o número de telefone que você "
-"informou. Verifique sua caixa de entrada (e de spam!) para o código e "
-"instruções sobre como usá-lo."
+msgid "A confirmation code was sent to the phone number you added. Check your inbox (and spam box!) for the code and instructions on how to use it."
+msgstr "Um código de confirmação foi enviado para o número de telefone que você informou. Verifique sua caixa de entrada (e de spam!) para o código e instruções sobre como usá-lo."
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -279,7 +217,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "O método da API não foi encontrado!"
 
@@ -302,16 +267,23 @@ msgstr "O método da API não foi encontrado!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "O método da API está em construção."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Sobre"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Aceitar"
 
@@ -322,6 +294,9 @@ msgstr "Aceitar"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Adicionar"
 
@@ -339,27 +314,29 @@ msgstr "Adicionar ou remover OpenIDs"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Endereço"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Endereços dos seus amigos que serão convidados (um por linha)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Todas as assinaturas"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Todas as atualizações para %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Todas as atualizações correspondentes ao termo \"%s\""
@@ -369,67 +346,67 @@ msgstr "Todas as atualizações correspondentes ao termo \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Já está logado."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Já foi assinado!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Você tem certeza que deseja excluir esta mensagem?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorizar a assinatura"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-"Entrar automaticamente sem pedir a senha. Não use em computadores "
-"compartilhados!"
+msgstr "Entrar automaticamente sem pedir a senha. Não use em computadores compartilhados!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
+msgid "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Assinar automaticamente à quem me assinar"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "O avatar foi atualizado."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, 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 ""
-"Aguardando a confirmação deste endereço. Procure em sua conta de Jabber/"
-"GTalk por uma mensagem com mais instruções (Você adicionou %s à sua lista de "
-"contatos?)"
+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 "Aguardando a confirmação deste endereço. Procure em sua conta de Jabber/GTalk por uma mensagem com mais instruções (Você adicionou %s à sua lista de contatos?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Aguardando a confirmação deste endereço. Procure em sua caixa de entrada (e "
-"de spam!) por uma mensagem com mais instruções."
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
+msgid "Awaiting confirmation on this address. Check your inbox (and spam box!) for a message with further instructions."
+msgstr "Aguardando a confirmação deste endereço. Procure em sua caixa de entrada (e de spam!) por uma mensagem com mais instruções."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Aguardando a confirmação deste número de telefone."
 
@@ -440,6 +417,8 @@ msgstr "Anteriores »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Descrição"
 
@@ -447,16 +426,18 @@ msgstr "Descrição"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Descrição muito extensa (máximo 140 caracteres)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Não é possível excluir esta mensagem."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Não é possível ler a URL '%s' do avatar"
@@ -464,6 +445,8 @@ msgstr "Não é possível ler a URL '%s' do avatar"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Não é possível salvar a nova senha."
 
@@ -471,31 +454,34 @@ msgstr "Não é possível salvar a nova senha."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Não foi possível instanciar um objeto do OpenID."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Não foi possível normalizar essa ID do Jabber"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Não foi possível normalizar este endereço de e-mail"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Alterar"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Configurações de uso do e-mail"
 
@@ -505,11 +491,12 @@ msgid "Change password"
 msgstr "Alterar a senha"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Altere a sua senha"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Alterar as suas configurações de perfil"
 
@@ -519,6 +506,9 @@ msgstr "Alterar as suas configurações de perfil"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -531,12 +521,14 @@ msgstr "Confirme o endereço"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Confirmação cancelada."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Código de confirmação"
 
@@ -545,54 +537,31 @@ msgstr "Código de confirmação"
 msgid "Confirmation code not found."
 msgstr "O código de confirmação não foi encontrado."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%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 ""
-"Parabéns, %s! E bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, você pode "
-"querer...\n"
-"\n"
-"* Acessar [seu perfil](%s) e publicar sua primeira mensagem.\n"
-"* Adicionar um [endereço de Jabber/GTalk](%%%%action.imsettings%%%%) para "
-"que você possa publicar via mensagens instantâneas.\n"
-"* [Procurar por pessoas](%%%%action.peoplesearch%%%%) que você conheça ou "
-"que tenham os mesmos interesses que você. \n"
-"* Atualizar suas [configurações de perfil](%%%%action.profilesettings%%%%) "
-"para que outras pessoas saibam mais sobre você. \n"
-"* Ler a [documentação on-line](%%%%doc.help%%%%) para conhecer os recursos "
-"disponíveis. \n"
-"\n"
-"Obrigado por se registrar e esperamos que você aproveite o serviço."
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to...\n\n* Go to [your profile](%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\nThanks for signing up and we hope you enjoy using this service."
+msgstr "Parabéns, %s! E bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, você pode querer...\n\n* Acessar [seu perfil](%s) e publicar sua primeira mensagem.\n* Adicionar um [endereço de Jabber/GTalk](%%%%action.imsettings%%%%) para que você possa publicar via mensagens instantâneas.\n* [Procurar por pessoas](%%%%action.peoplesearch%%%%) que você conheça ou que tenham os mesmos interesses que você. \n* Atualizar suas [configurações de perfil](%%%%action.profilesettings%%%%) para que outras pessoas saibam mais sobre você. \n* Ler a [documentação on-line](%%%%doc.help%%%%) para conhecer os recursos disponíveis. \n\nObrigado por se registrar e esperamos que você aproveite o serviço."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Conectar"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Conectar-se a uma conta já existente"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Contato"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Não foi possível criar o formulário OpenID: %s"
@@ -600,49 +569,51 @@ msgstr "Não foi possível criar o formulário OpenID: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Não é possível seguir o usuário: %s já está na sua lista."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Não é possível seguir o usuário: Usuário não encontrado."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Não foi possível redirecionar para o servidor: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Não foi possível salvar as informações do avatar"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Não foi possível salvar as novas informações do perfil"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Não foi possível fazer com que o outros o sigam."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Não foi possível assinar."
 
 #: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr ""
-"Não foi possível atualizar o usuário com o endereço de e-mail confirmado."
+msgstr "Não foi possível atualizar o usuário com o endereço de e-mail confirmado."
 
 #: ../actions/finishremotesubscribe.php:99
 #: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
-"Não foi possível converter os tokens de requisição para tokens de acesso."
+msgstr "Não foi possível converter os tokens de requisição para tokens de acesso."
 
 #: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
@@ -650,15 +621,17 @@ msgstr ""
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Não foi possível excluir a confirmação de e-mail."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Não foi possível excluir a assinatura."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Não foi possível encontrar nenhum status."
 
@@ -671,29 +644,38 @@ msgstr "Não foi possível obter um token de requisição."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Não foi possível inserir o código de confirmação."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir a nova assinatura."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Não foi possível salvar o perfil."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Não foi possível atualizar o usuário para assinar automaticamente."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Não foi possível atualizar o registro do usuário."
 
@@ -709,42 +691,48 @@ msgstr "Não foi possível atualizar o registro do usuário."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Não foi possível atualizar o usuário."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Criar"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Criar um novo usuário com este apelido."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Criar uma nova conta"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Criando uma nova conta para um OpenID que já tem um usuário."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Endereço de Jabber/GTalk já confirmado."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de telefone já habilitado para receber SMS."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Endereço de e-mail já confirmado."
 
@@ -753,23 +741,27 @@ msgid "Currently"
 msgstr "Neste momento"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Erro no banco de dados durante a inserção de hashtag: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Erro no banco de dados na inserção da reposta: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Excluir a mensagem"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
 
@@ -777,11 +769,13 @@ msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "E-mail"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Endereço de e-mail"
 
@@ -791,39 +785,43 @@ msgid "Email Settings"
 msgstr "Configurações do e-mail"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "O endereço de e-mail já existe."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmação do endereço de e-mail"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Endereços de e-mail"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Entre com o apelido ou endereço de e-mail."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Informe o código que você recebeu no seu telefone."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Erro na autorização do token"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Erro na conexão do usuário ao OpenID."
 
@@ -834,39 +832,46 @@ msgstr "Erro na conexão do usuário."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Erro na inserção do avatar"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Erro na inserção do novo perfil"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Erro na inserção do perfil remoto"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Erro ao salvar o endereço de confirmação"
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Erro ao salvar o perfil remoto"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Erro ao salvar o perfil."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Erro ao salvar o usuário."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Erro ao salvar usuário; inválido."
 
@@ -875,6 +880,9 @@ msgstr "Erro ao salvar usuário; inválido."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Erro na configuração do usuário."
 
@@ -885,6 +893,7 @@ msgstr "Erro na atualização do perfil"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Erro na atualização do perfil remoto"
 
@@ -894,33 +903,36 @@ msgid "Error with confirmation code."
 msgstr "Erro com o código de confirmação."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Apelido já existe"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Não foi possível atualizar o avatar."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed para os amigos de %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed para respostas para %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Feed para tag %s"
@@ -935,19 +947,20 @@ msgstr "Procure no conteúdo das mensagens"
 msgid "Find people on this site"
 msgstr "Procure por pessoas neste site"
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-"Por razões de segurança, por favor, digite novamente seu nome de usuário e "
-"senha antes de alterar suas configurações."
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+msgid "For security reasons, please re-enter your user name and password before changing your settings."
+msgstr "Por razões de segurança, por favor, digite novamente seu nome de usuário e senha antes de alterar suas configurações."
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Nome completo"
 
@@ -956,23 +969,33 @@ msgstr "Nome completo"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Ajuda"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Início"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Site"
 
@@ -980,21 +1003,27 @@ msgstr "Site"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "A URL do site informada não é válida."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Eu quero publicar mensagens por e-mail."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "Endereço do IM"
 
@@ -1004,84 +1033,75 @@ msgid "IM Settings"
 msgstr "Configurações do IM"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-"Se você já possui uma conta, utilize seu nome de usuário e senha para "
-"conectá-la ao seu OpenID."
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
+msgid "If you already have an account, login with your username and password to connect it to your OpenID."
+msgstr "Se você já possui uma conta, utilize seu nome de usuário e senha para conectá-la ao seu OpenID."
 
-#: ../actions/openidsettings.php:45
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-"Se você quer adicionar um OpenID à sua conta, informe-a na caixa abaixo e "
-"clique em \"Adicionar\"."
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
+msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"."
+msgstr "Se você quer adicionar um OpenID à sua conta, informe-a na caixa abaixo e clique em \"Adicionar\"."
 
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-"Se você esqueceu ou perdeu sua senha, você pode receber uma nova no endereço "
-"de e-mail que armazenou em sua conta."
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
+msgid "If you've forgotten or lost your password, you can get a new one sent to the email address you have stored  in your account."
+msgstr "Se você esqueceu ou perdeu sua senha, você pode receber uma nova no endereço de e-mail que armazenou em sua conta."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "E-mail de recebimento"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "O endereço de e-mail de recebimento foi removido."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "A senha antiga está incorreta"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Nome de usuário e/ou senha incorreto(s)."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"As instruções para recuperar a sua senha foram enviadas para o endereço de e-"
-"mail informado no seu cadastro."
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
+msgid "Instructions for recovering your password have been sent to the email address registered to your account."
+msgstr "As instruções para recuperar a sua senha foram enviadas para o endereço de e-mail informado no seu cadastro."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "A URL '%s' para o avatar é inválida"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Não é um endereço de e-mail válido: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "O site '%s' é inválido"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "A URL '%s' da licença é inválida"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "O conteúdo da mensagem é inválido"
 
@@ -1096,13 +1116,13 @@ msgid "Invalid notice url"
 msgstr "A URL da mensagem é inválida"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "A URL '%s' do perfil é inválida."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "A URL do perfil é inválida (formato inválido)"
 
@@ -1120,60 +1140,59 @@ msgstr "Tamanho inválido."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nome de usuário e/ou senha inválido(s)"
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Convite(s) enviado(s)"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Convite(s) enviado(s) para as seguintes pessoas:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Convidar"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Convidar novos usuários"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 ""
-"Ele funciona sob o software de microblogagem [StatusNet](http://status.net/), "
-"versão %s, disponível sob a [GNU Affero General Public License] (http://www."
-"fsf.org/licensing/licenses/agpl-3.0.html)."
+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 "Ele funciona sob o software de microblogagem [StatusNet](http://status.net/), versão %s, disponível sob a [GNU Affero General Public License] (http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Esta ID do Jabber já pertence à outro usuário."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, 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 ""
-"Endereço de Jabber ou GTalk, ex: \"usuario@exemplo.org\". Primeiro, "
-"certifique-se de adicionar %s à sua lista de contatos no seu cliente de IM "
-"ou no GTalk."
+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 "Endereço de Jabber ou GTalk, ex: \"usuario@exemplo.org\". Primeiro, certifique-se de adicionar %s à sua lista de contatos no seu cliente de IM ou no GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Idioma"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
 
@@ -1182,7 +1201,15 @@ msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Localização"
 
@@ -1191,7 +1218,12 @@ msgstr "Localização"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "A localização é muito extensa (máx. 255 caracteres)."
 
@@ -1200,44 +1232,46 @@ msgstr "A localização é muito extensa (máx. 255 caracteres)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Logar"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Logar-se com uma conta [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
-msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
-"%). "
-msgstr ""
-"Logar-se com seu nome de usuário e senha. Não tem um nome de usuário ainda? "
-"[Registre](%%action.register%%) uma nova conta, ou use uma "
-"[OpenID](%%action.openidlogin%%)."
+msgid "Login with your username and password. Don't have a username yet? [Register](%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%%). "
+msgstr "Logar-se com seu nome de usuário e senha. Não tem um nome de usuário ainda? [Registre](%%action.register%%) uma nova conta, ou use uma [OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Sair"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome completo (nome e sobrenome), de preferência seu nome \"real\""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu sua senha?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Cria um novo endereço de e-mail para publicar e cancela o antigo."
 
@@ -1248,68 +1282,71 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Configure o recebimento de e-mails do %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Membro desde"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog por %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, 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 ""
-"A operadora móvel do seu celular. Se você conhece uma operadora que aceita "
-"SMS via e-mail que não está listada aqui, informe-nos enviando uma mensagem "
-"para %s."
+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 "A operadora móvel do seu celular. Se você conhece uma operadora que aceita SMS via e-mail que não está listada aqui, informe-nos enviando uma mensagem para %s."
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Meus textos e arquivos estão disponíveis sob "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Novo"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Novo endereço de e-mail para postar para %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
-msgstr ""
-"Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
+msgstr "Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Novo apelido"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Nova mensagem"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nova senha"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
-msgstr ""
-"A nova senha foi salva com sucesso. A partir de agora você já está logado."
+msgstr "A nova senha foi salva com sucesso. A partir de agora você já está logado."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151 actions/login.php:101
@@ -1317,7 +1354,13 @@ msgstr ""
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Apelido"
 
@@ -1326,7 +1369,12 @@ msgstr "Apelido"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Este apelido já está em uso. Tente outro."
 
@@ -1335,49 +1383,58 @@ msgstr "Este apelido já está em uso. Tente outro."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"O apelido deve conter apenas letras minúsculas e/ou números e não pode ter "
-"acentuação e espaços."
+msgstr "O apelido deve conter apenas letras minúsculas e/ou números e não pode ter acentuação e espaços."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Este apelido não é permitido."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Apelido do usuário que você quer seguir"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Apelido ou e-mail"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "Não"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Nenhuma ID de Jabber."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Nenhum pedido de autorização!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Não foi selecionada nenhuma operadora."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Não foi digitado nenhum código"
 
@@ -1389,11 +1446,15 @@ msgstr "Nenhum código de confirmação."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Nenhum conteúdo!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Nenhum endereço de e-mail."
 
@@ -1402,7 +1463,9 @@ msgid "No id."
 msgstr "Nenhuma ID."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "Nenhum endereço de e-mail para recebimentos."
 
@@ -1413,6 +1476,7 @@ msgstr "Nenhum apelido fornecido pelo servidor remoto."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Nenhum apelido."
 
@@ -1420,12 +1484,14 @@ msgstr "Nenhum apelido."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmação pendente para cancelar."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Nenhum número de telefone."
 
@@ -1435,7 +1501,8 @@ msgid "No profile URL returned by server."
 msgstr "Nenhuma URL de perfil retornada pelo servidor."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Nenhum endereço de e-mail registrado para esse usuário."
 
@@ -1447,7 +1514,7 @@ msgstr "Não foi encontrada nenhuma requisição!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Nenhum resultado"
 
@@ -1458,12 +1525,16 @@ msgstr "Sem tamanho definido."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Não foi encontrado nenhum status com esse ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Não foi encontrado nenhum status com esse ID."
 
@@ -1473,13 +1544,15 @@ msgid "No such OpenID."
 msgstr "Essa OpenID não existe."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Esse documento não existe."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Essa mensagem não existe."
 
@@ -1517,16 +1590,24 @@ msgstr "Essa assinatura não existe."
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Usuário não encontrado."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
-msgstr ""
-"Não foi encontrado nenhum usuário com essa identificação ou endereço de "
-"email."
+msgstr "Não foi encontrado nenhum usuário com essa identificação ou endereço de email."
 
 #: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
@@ -1538,32 +1619,38 @@ msgid "Not a recovery code."
 msgstr "Não é um código de recuperação"
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Não é um usuário registrado."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Não é uma ID de Jabber válida"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Não é uma OpenID válida."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Não é um endereço de e-mail válido"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Não é um endereço de e-mail válido."
 
@@ -1571,6 +1658,11 @@ msgstr "Não é um endereço de e-mail válido."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Não é um apelido válido."
 
@@ -1590,7 +1682,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Não é uma URL de perfil válida (nenhum documento YADIS)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Imagem inválida ou arquivo corrompido."
 
@@ -1601,11 +1694,13 @@ msgstr "Não autorizado."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Não esperava por esta resposta!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Não encontrado"
 
@@ -1621,11 +1716,15 @@ msgstr "Não encontrado"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Você não está logado."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Não é seguido!"
 
@@ -1642,39 +1741,44 @@ msgid "Notice feed for %s"
 msgstr "Feed de mensagens de %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "A mensagem não está associada a nenhum perfil"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Mensagens"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Mensagens etiquetadas com %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Senha antiga"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "Configuração da conta OpenID"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "Submissão automática da OpenID"
 
@@ -1682,29 +1786,34 @@ msgstr "Submissão automática da OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "Logar-se via OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "URL da OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "A autenticação pela OpenID foi cancelada."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Não foi possível logar via OpenID: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "Falha na OpenID: %s"
@@ -1720,11 +1829,12 @@ msgid "OpenID settings"
 msgstr "Configurações da OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Envio parcial."
 
@@ -1734,34 +1844,46 @@ msgstr "Envio parcial."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Senha"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "A senha e a confirmação não coincidem."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "A senha deve ter 6 caracteres ou mais."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Foi solicitada a recuperação da senha"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "A senha foi salva."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "As senhas não coincidem."
 
@@ -1781,29 +1903,26 @@ msgid "People search"
 msgstr "Procurar pessoas"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Pessoal"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Mensagem pessoal"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
 
 #: ../actions/userauthorization.php:78
-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 \"Cancel\"."
-msgstr ""
-"Por favor, verifique estes detalhes para ter certeza que você quer seguir as "
-"mensagens deste usuário. Se você não solicitou seguir as mensagens de "
-"alguém, clique em \"Cancelar\"."
+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 \"Cancel\"."
+msgstr "Por favor, verifique estes detalhes para ter certeza que você quer seguir as mensagens deste usuário. Se você não solicitou seguir as mensagens de alguém, clique em \"Cancelar\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
 
@@ -1812,7 +1931,9 @@ msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -1821,42 +1942,52 @@ msgstr "Preferências"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "As preferências foram salvas."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Idioma preferencial"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Privacidade"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Problema ao salvar a mensagem."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Perfil"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "URL do Perfil"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configurações do perfil"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Perfil desconhecido"
 
@@ -1864,19 +1995,20 @@ msgstr "Perfil desconhecido"
 msgid "Public Stream Feed"
 msgstr "Feed de mensagens públicas"
 
-# Just for me.
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Mensagens públicas"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publique um MicroID para meu endereço de e-mail."
 
@@ -1886,12 +2018,14 @@ msgid "Recent Tags"
 msgstr "Tags recentes"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Recuperar"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Recuperar a senha"
 
@@ -1904,37 +2038,45 @@ msgstr "Código de recuperação para usuário desconhecido."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrar"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Não é permitido o registro."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Registro realizado com sucesso"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Recusar"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Lembrar neste computador"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Perfil remoto sem referencia local"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Assinatura remota"
 
@@ -1948,6 +2090,9 @@ msgstr "Assinatura remota"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Remover"
 
@@ -1956,43 +2101,46 @@ msgstr "Remover"
 msgid "Remove OpenID"
 msgstr "Remover OpenID"
 
-#: ../actions/openidsettings.php:73
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-"Remover a sua única OpenID pode fazer com que seja impossível você logar-se "
-"novamente! Se deseja realmente removê-la, adicione outra OpenID antes."
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
+msgid "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first."
+msgstr "Remover a sua única OpenID pode fazer com que seja impossível você logar-se novamente! Se deseja realmente removê-la, adicione outra OpenID antes."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Respostas"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas para %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Restaurar"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Restaurar a senha"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "Telefone para SMS"
 
@@ -2001,17 +2149,18 @@ msgstr "Telefone para SMS"
 msgid "SMS Settings"
 msgstr "Configuração de SMS"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "Confirmação de SMS"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Igual à senha acima"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Igual à senha acima. Obrigatório."
 
@@ -2024,12 +2173,21 @@ msgstr "Igual à senha acima. Obrigatório."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Salvar"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Procurar"
 
@@ -2039,72 +2197,65 @@ msgid "Search Stream Feed"
 msgstr "Procurar no fluxo de mensagens"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 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 ""
-"Procurar mensagens em %%site.name%% por seu conteúdo. Separe os termos da "
-"busca com espaços; eles devem ter 3 caracteres ou mais."
+msgid "Search for notices on %%site.name%% by their contents. Separate search terms by spaces; they must be 3 characters or more."
+msgstr "Procurar mensagens em %%site.name%% por seu conteúdo. Separe os termos da busca com espaços; eles devem ter 3 caracteres ou mais."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 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 ""
-"Procurar por pessoas em %%site.name%% por seus nomes, localidade ou "
-"interesses. Separe os termos da busca com espaços; eles devem ter 3 "
-"caracteres ou mais."
+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 "Procurar por pessoas em %%site.name%% por seus nomes, localidade ou interesses. Separe os termos da busca com espaços; eles devem ter 3 caracteres ou mais."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Selecione uma operadora"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Enviar"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Envie e-mails para esse endereço para publicar novas mensagens."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Envie-me notificações de novos assinantes por e-mail."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envie-me as mensagens via Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-"Envie-me mensagens via SMS. Eu compreendo que isso pode gerar cobranças "
-"exorbitantes da minha operadora."
+#: actions/smssettings.php:162 actions/smssettings.php:174
+msgid "Send me notices through SMS; I understand I may incur exorbitant charges from my carrier."
+msgstr "Envie-me mensagens via SMS. Eu compreendo que isso pode gerar cobranças exorbitantes da minha operadora."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-"Envie-me respostas de pessoas que eu não estou seguindo através do "
-"Jabber/GTalk."
+msgstr "Envie-me respostas de pessoas que eu não estou seguindo através do Jabber/GTalk."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Configurações"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "As configurações foram salvas."
 
@@ -2124,27 +2275,32 @@ msgid "Something weird happened."
 msgstr "Aconteceu alguma coisa estranha..."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Desculpe-me, mas não é permitido o recebimento de emails."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Fonte"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Estatísticas"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "O OpenID armazenado não foi encontrado."
 
@@ -2152,24 +2308,28 @@ msgstr "O OpenID armazenado não foi encontrado."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Assinar"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Assinantes"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "A assinatura foi autorizada"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "A assinatura foi recusada"
 
@@ -2177,28 +2337,35 @@ msgstr "A assinatura foi recusada"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Assinaturas"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Erro no sistema durante o envio do arquivo."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Tags"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Texto"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Procurar por texto"
 
@@ -2218,6 +2385,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Esse código de confirmação não é seu!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Esse endereço de e-mail já pertence à outro usuário."
 
@@ -2227,63 +2395,73 @@ msgid "That file is too big."
 msgstr "Esse arquivo é muito grande."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Essa já é sua ID do Jabber."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Esse já é seu endereço de e-mail."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Esse já é seu número de telefone."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Essa não é sua ID do Jabber."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Esse não é seu endereço de email."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Esse não é seu número de telefone."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Isso é um endereço de IM errado."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Isso é um número de confirmação errado."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Esse número de telefone já pertence à outro usuário."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Está muito extenso. O tamanho máximo é de 255 caracteres."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "O endereço \"%s\" foi confirmado para sua conta."
@@ -2292,81 +2470,70 @@ msgstr "O endereço \"%s\" foi confirmado para sua conta."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "O endereço foi removido."
 
-#: ../actions/userauthorization.php:312
-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 ""
-"A assinatura foi autorizada, mas não foi informada nenhuma URL de retorno. "
-"Verifique as instruções do site para detalhes sobre como autorizar a "
-"assinatura. Seu token de assinatura é:"
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
+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 "A assinatura foi autorizada, mas não foi informada nenhuma URL de retorno. Verifique as instruções do site para detalhes sobre como autorizar a assinatura. Seu token de assinatura é:"
 
-#: ../actions/userauthorization.php:322
-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 ""
-"A assinatura foi rejeitada, mas não foi informada nenhuma URL de retorno. "
-"Verifique as instruções do site para maiores detalhes em como rejeitar "
-"completamente a assinatura."
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
+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 "A assinatura foi rejeitada, mas não foi informada nenhuma URL de retorno. Verifique as instruções do site para maiores detalhes em como rejeitar completamente a assinatura."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Estas são as pessoas que acompanham as mensagens de %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Estas são as pessoas que acompanham as suas mensagens."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Estas são as pessoas cujas mensagens %s acompanha."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Estas são as pessoas cujas mensagens você acompanha."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
+#: actions/invite.php:130 actions/invite.php:136
+msgid "These people are already users and you were automatically subscribed to them:"
 msgstr "Estas pessoas já são usuárias e você as acompanha automaticamente:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Este código de confirmação é muito antigo. Por favor inicie novamente."
 
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Este formulário deve enviar-se automaticamente. Caso isso não ocorra, clique "
-"no botão \"Enviar\" para ir para seu provedor de OpenID."
+#: ../lib/openid.php:195 lib/openid.php:206
+msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider."
+msgstr "Este formulário deve enviar-se automaticamente. Caso isso não ocorra, clique no botão \"Enviar\" para ir para seu provedor de OpenID."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your OpenID "
-"to a local account. You can either create a new account, or connect with "
-"your existing account, if you have one."
-msgstr ""
-"Esta é a primeira vez que você autenticou-se em %s. Por isso nós precisamos "
-"conectar sua OpenID a uma conta local. Você pode criar uma conta nova, ou "
-"conectar a uma conta sua já existente, caso tenha uma."
+msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one."
+msgstr "Esta é a primeira vez que você autenticou-se em %s. Por isso nós precisamos conectar sua OpenID a uma conta local. Você pode criar uma conta nova, ou conectar a uma conta sua já existente, caso tenha uma."
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Este método requer POSTAGEM ou EXCLUSÃO."
 
@@ -2375,49 +2542,57 @@ msgstr "Este método requer POSTAGEM ou EXCLUSÃO."
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Este método requer um POST."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Esta página não está disponível em um tipo de mídia que você aceita"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Fuso horário"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "O fuso horário não foi selecionado."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: 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 ""
-"Para assinar, você pode [autenticar-se](%%action.login%%), ou "
-"[registrar](%%action.register%%) uma nova conta. Se você já tem uma conta em "
-"um [site de microblogagem compatível](%%doc.openmublog%%), informe a URL do "
-"seu perfil abaixo."
+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 "Para assinar, você pode [autenticar-se](%%action.login%%), ou [registrar](%%action.register%%) uma nova conta. Se você já tem uma conta em um [site de microblogagem compatível](%%doc.openmublog%%), informe a URL do seu perfil abaixo."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Duas IDs de usuário ou screen_names devem ser informados."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL do seu site, blog ou perfil em outro site"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL do seu perfil em outro serviço de microblogagem compatível"
 
@@ -2429,15 +2604,22 @@ msgstr "URL do seu perfil em outro serviço de microblogagem compatível"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Submissão inesperada de formulário."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Restauração inesperada da senha."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Ação desconhecida"
 
@@ -2447,12 +2629,8 @@ msgid "Unknown version of OMB protocol."
 msgstr "Versão desconhecida do protocolo OMB."
 
 #: ../lib/util.php:269 lib/util.php:285
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr ""
-"Caso não seja especificado, os colaboradores deste site possuem direito "
-"autoral sobre seu conteúdo e ele está disponível sob"
+msgid "Unless otherwise specified, contents of this site are copyright by the contributors and available under the "
+msgstr "Caso não seja especificado, os colaboradores deste site possuem direito autoral sobre seu conteúdo e ele está disponível sob"
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #: actions/confirmaddress.php:90
@@ -2468,66 +2646,67 @@ msgstr "Cancelar"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Versão do OMB não suportada"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Formato de imagem não suportado."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Atualizações via SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Atualizações via instant messenger (IM)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Atualizações de %1$s e amigos no %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Atualizações de %1$s no %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Enviar"
 
 #: ../actions/avatar.php:27
-msgid ""
-"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
-"you upload it, so make sure it's more or less square. It must be under the "
-"site license, also. Use a picture that belongs to you and that you want to "
-"share."
-msgstr ""
-"Envie um novo \"avatar\" (imagem do usuário) aqui. Você não poderá editar a "
-"imagem depois que enviar, então certifique-se que o formato dela esteja mais "
-"ou menos quadrada. Ela deve estar sob a mesma licença do site. Use uma "
-"imagem que pertença a você e que você queira compartilhar."
+msgid "Upload a new \"avatar\" (user image) here. You can't edit the picture after you upload it, so make sure it's more or less square. It must be under the site license, also. Use a picture that belongs to you and that you want to share."
+msgstr "Envie um novo \"avatar\" (imagem do usuário) aqui. Você não poderá editar a imagem depois que enviar, então certifique-se que o formato dela esteja mais ou menos quadrada. Ela deve estar sob a mesma licença do site. Use uma imagem que pertença a você e que você queira compartilhar."
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
 msgstr "Envie uma nova imagem para o seu perfil"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-"Use esse formulário para convidar seus amigos e colegas para usar este "
-"serviço."
+#: actions/invite.php:156 actions/invite.php:162
+msgid "Use this form to invite your friends and colleagues to use this service."
+msgstr "Use esse formulário para convidar seus amigos e colegas para usar este serviço."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
 
@@ -2551,11 +2730,16 @@ msgstr "O usuário que está está sendo acompanhado não existe."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "O usuário não tem perfil."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Apelido do usuário"
 
@@ -2564,29 +2748,33 @@ msgid "User not found."
 msgstr "Usuário não encontrado."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "Em que fuso horário você normalmente está?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "E aí, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo de imagem errado para '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Tamanho da imagem errada em '%s'"
@@ -2594,7 +2782,9 @@ msgstr "Tamanho da imagem errada em '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Sim"
 
@@ -2604,12 +2794,8 @@ msgid "You already have this OpenID!"
 msgstr "Você já tem esta OpenID!"
 
 #: ../actions/deletenotice.php:37 actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-"Você está prestes a apagar permanentemente uma mensagem. Isso não poderá ser "
-"desfeito."
+msgid "You are about to permanently delete a notice.  Once this is done, it cannot be undone."
+msgstr "Você está prestes a apagar permanentemente uma mensagem. Isso não poderá ser desfeito."
 
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 #: actions/recoverpassword.php:36
@@ -2617,11 +2803,12 @@ msgid "You are already logged in!"
 msgstr "Você já está logado!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Você já está assinando esses usuários:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "Você não é amigo do usuário especificado."
 
@@ -2639,149 +2826,133 @@ msgstr "Você pode criar uma nova conta para começar a publicar mensagens."
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Você pode receber mensagens SMS do %%site.name%% através do e-mail."
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Você pode remover uma OpenID da sua conta, clicando no botão \"Remover\"."
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
+msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"."
+msgstr "Você pode remover uma OpenID da sua conta, clicando no botão \"Remover\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
-msgstr ""
-"Você pode enviar e receber mensagens através dos [instant "
-"messages](%%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo."
+msgid "You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below."
+msgstr "Você pode enviar e receber mensagens através dos [instant messages](%%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo."
 
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about you."
-msgstr ""
-"Você pode atualizar suas informações pessoais aqui, para que as pessoas "
-"saibam mais sobre você."
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
+msgid "You can update your personal profile info here so people know more about you."
+msgstr "Você pode atualizar suas informações pessoais aqui, para que as pessoas saibam mais sobre você."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Você pode usar a assinatura local!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Você não pode se registrar se não aceitar a licença."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Você não nos enviou esse perfil"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, 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 ""
-"Você tem um novo endereço para publicação no %1$s.\n"
-"\n"
-"Para publicar novas mensagens, envie e-mails para %2$s .\n"
-"\n"
-"Mais instruções em %3$s.\n"
-"\n"
-"Atenciosamente,\n"
-"%4$s"
+msgid "You have a new posting address on %1$s.\n\nSend email to %2$s to post new messages.\n\nMore email instructions at %3$s.\n\nFaithfully yours,\n%4$s"
+msgstr "Você tem um novo endereço para publicação no %1$s.\n\nPara publicar novas mensagens, envie e-mails para %2$s .\n\nMais instruções em %3$s.\n\nAtenciosamente,\n%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Você não pode apagar o status de outro usuário."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "Você deve estar logado para convidar outros usuários para usar o %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-"Você será notificado assim que seus convidados aceitarem o convite e se "
-"registrarem neste site. Obrigado por aumentar a comunidade!"
+#: actions/invite.php:144 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 "Você será notificado assim que seus convidados aceitarem o convite e se registrarem neste site. Obrigado por aumentar a comunidade!"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Você foi identificado. Informe uma nova senha abaixo."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "Sua URL de OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Seu apelido neste servidor, ou seu e-mail registrado."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
-msgstr ""
-"A [OpenID](%%doc.openid%%) permite que você autentique-se em vários sites "
-"com a mesma conta de usuário. Gerencie suas OpenIDs associadas aqui."
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user account.  Manage your associated OpenIDs from here."
+msgstr "A [OpenID](%%doc.openid%%) permite que você autentique-se em vários sites com a mesma conta de usuário. Gerencie suas OpenIDs associadas aqui."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "segundos atrás"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "%d dias atrás"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d horas atrás"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d mins atrás"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "%d meses atrás"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "1 dia atrás"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "1 min atrás"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "1 mês atrás"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "1 ano atrás"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "1 hora atrás"
 
@@ -2803,12 +2974,14 @@ msgid "reply"
 msgstr "responder"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "igual à senha acima"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "tipo de arquivo não suportado"
 
@@ -2829,15 +3002,35 @@ msgstr "« Posteriores"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
+msgstr "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
 
 #: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "Essa mensagem não é uma favorita!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Não foi possível excluir a favorita."
 
@@ -2845,24 +3038,28 @@ msgstr "Não foi possível excluir a favorita."
 msgid "Favor"
 msgstr "Tornar favorita"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
-"Envie-me um e-mail quando alguém adicionar alguma mensagem minha como "
-"favorita."
+msgstr "Envie-me um e-mail quando alguém adicionar alguma mensagem minha como favorita."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Envie-me um e-mail quando alguém enviar-me uma mensagem particular."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Essa mensagem já é uma favorita!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Não foi possível criar a favorita."
 
@@ -2872,11 +3069,13 @@ msgstr "Eliminar favorita"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "Mensagens favoritas de %s"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Feed de mensagens favoritas de %s"
@@ -2893,18 +3092,12 @@ msgstr "Recebidas por %s"
 
 #: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
-"Essa é a sua caixa de mensagens recebidas, que lista as mensagens "
-"particulares que você recebeu."
+msgstr "Essa é a sua caixa de mensagens recebidas, que lista as mensagens particulares que você recebeu."
 
 #: actions/invite.php:178 actions/invite.php:213
 #, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-msgstr ""
-"%1$s convidou você para unir-se a %2$s (%3$s).\n"
-"\n"
+msgid "%1$s has invited you to join them on %2$s (%3$s).\n\n"
+msgstr "%1$s convidou você para unir-se a %2$s (%3$s).\n\n"
 
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
@@ -2920,35 +3113,43 @@ msgid "Login with your username and password. "
 msgstr "Logue-se com o seu nome de usuário e senha. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Muito extenso. O tamanho máximo das mensagens é 140 caracteres."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Nenhum destinatário especificado."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Você não pode enviar uma mensagem para esse usuário."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"Não envie uma mensagem para você mesmo(a); ao invés disso, apenas diga-a "
-"para si."
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
+msgid "Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr "Não envie uma mensagem para você mesmo(a); ao invés disso, apenas diga-a para si."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "Esse usuário não existe"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nova mensagem"
 
@@ -2985,17 +3186,12 @@ msgstr "Envidas para %s"
 
 #: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
-"Essa é a sua caixa de mensagens enviadas, que lista as mensagens "
-"particulares que você enviou."
+msgstr "Essa é a sua caixa de mensagens enviadas, que lista as mensagens particulares que você enviou."
 
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
-"Procurar por pessoas no %%site.name%% pelo seu nome, localização ou "
-"interesses. "
+msgid "Search for people on %%site.name%% by their name, location, or interests. "
+msgstr "Procurar por pessoas no %%site.name%% pelo seu nome, localização ou interesses. "
 
 #: actions/profilesettings.php:27 actions/profilesettings.php:69
 msgid "You can update your personal profile info here "
@@ -3006,6 +3202,11 @@ msgstr "Você pode atualizar as informações do seu perfil pessoal aqui "
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Usuário sem um perfil correspondente"
 
@@ -3034,17 +3235,15 @@ msgid "New password successfully saved. "
 msgstr "A nova senha foi salva com sucesso. "
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "A senha deve ter 6 ou mais caracteres."
 
 #: actions/register.php:216
 #, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
-"Parabéns, %s! E seja bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, você "
-"pode querer..."
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to..."
+msgstr "Parabéns, %s! E seja bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, você pode querer..."
 
 #: actions/register.php:227
 msgid "(You should receive a message by email momentarily, with "
@@ -3056,12 +3255,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "Para seguir alguem, você pode [autenticar-se](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Feed para favoritas de %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Não foi possível recuperar as mensagens favoritas."
 
@@ -3069,7 +3271,7 @@ msgstr "Não foi possível recuperar as mensagens favoritas."
 msgid "No such message."
 msgstr "Essa mensagem não existe."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Apenas o remetente e o destinatário podem ler essa mensagem."
 
@@ -3093,53 +3295,70 @@ msgid "Mobile carrier for your phone. "
 msgstr "Operadora móvel do seu celular. "
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Mensagem direta para %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Todas as mensagens diretas enviadas para %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Mensagens diretas que você enviou"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Todas as mensagens diretas enviadas por %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Nenhuma mensagem de texto!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "O usuário destinatário não foi encontrado."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Não é possível enviar mensagens diretas para usuários que não são seus "
-"amigos."
+msgstr "Não é possível enviar mensagens diretas para usuários que não são seus amigos."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoritas de %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s atualizações de favoritas por %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s marcaram sua mensagem como favorita"
@@ -3147,29 +3366,25 @@ msgstr "%s marcaram sua mensagem como favorita"
 #: actions/twitapifavorites.php:188 lib/mail.php:276
 #: actions/twitapifavorites.php:165
 #, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-msgstr ""
-"%1$s acabou de marcar sua mensagem de %2$s como uma favorita.\n"
-"\n"
+msgid "%1$s just added your notice from %2$s as one of their favorites.\n\n"
+msgstr "%1$s acabou de marcar sua mensagem de %2$s como uma favorita.\n\n"
 
 #: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-"Adicione a sua conta do Twitter para enviar suas mensagens para lá "
-"automaticamente, "
+msgid "Add your Twitter account to automatically send your notices to Twitter, "
+msgstr "Adicione a sua conta do Twitter para enviar suas mensagens para lá automaticamente, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Configurações do Twitter"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Conta do Twitter"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Conta do Twitter já verificada."
 
@@ -3178,6 +3393,7 @@ msgid "Twitter Username"
 msgstr "Nome de usuário do Twitter"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Sem espaços, por favor."
 
@@ -3186,26 +3402,27 @@ msgid "Twitter Password"
 msgstr "Senha do Twitter"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Enviar minhas mensagens para o Twitter automaticamente."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Enviar respostas \"@\" locais para o Twitter."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Assinar meus amigos do Twitter aqui."
 
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-msgstr ""
-"O nome de usuário pode ter, no máximo, 15 caracteres, sendo eles números, "
-"letras maiúsculas e minúsculas e sublinhado (_)."
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
+msgid "Username must have only numbers, upper- and lowercase letters, and underscore (_). 15 chars max."
+msgstr "O nome de usuário pode ter, no máximo, 15 caracteres, sendo eles números, letras maiúsculas e minúsculas e sublinhado (_)."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "Não foi possível verificar suas credenciais no Twitter!"
 
@@ -3216,33 +3433,43 @@ msgstr "Não foi possível obter as informações da conta \"%s\" no Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "Não foi possível salvar suas configurações do Twitter!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "As configurações do Twitter foram salvas."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Essa não é a sua conta no Twitter."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "Não foi possível remover o usuário do Twitter."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "A conta do Twitter foi removida."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "Não foi possível salvar as preferências do Twitter."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "As preferências do Twitter foram salvas."
 
@@ -3259,18 +3486,19 @@ msgid "The subscription has been rejected, but no "
 msgstr "A assinatura foi recusada, mas não "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Resultados do comando"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "O comando foi completado"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "O comando falhou"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Desculpe, mas esse comando ainda não foi implementado."
 
@@ -3280,90 +3508,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "Assinaturas: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "O usuário não tem uma \"última mensagem\""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Mensagem marcada como favorita."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Localização: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
-"A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d"
+msgstr "A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "A mensagem direta para %s foi enviada"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Ocorreu um erro durante o envio da mensagem direta."
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especifique o nome do usuário que será assinado"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Efetuada a assinatura de %s"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especifique o nome do usuário que deixará de ser assinado"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Cancelada a assinatura de %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "O comando não foi implementado ainda."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Notificação desligada."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "Não é possível desligar a notificação"
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Notificação ligada."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Não é possível ligar a notificação."
 
@@ -3371,11 +3620,11 @@ msgstr "Não é possível ligar a notificação."
 msgid "Commands:\n"
 msgstr "Comandos:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "Não foi possível inserir a mensagem."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "Não foi possível atualizar a mensagem com a nova URI."
 
@@ -3385,28 +3634,20 @@ msgstr "Usuário sem um perfil correspondente no sistema."
 
 #: lib/mail.php:147 lib/mail.php:289
 #, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-msgstr ""
-"Você tem um novo endereço para publicação no %1$s.\n"
-"\n"
+msgid "You have a new posting address on %1$s.\n\n"
+msgstr "Você tem um novo endereço para publicação no %1$s.\n\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova mensagem particular de %s"
 
 #: lib/mail.php:253 lib/mail.php:512
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-msgstr ""
-"%1$s (%2$s) enviou uma mensagem particular para você:\n"
-"\n"
+msgid "%1$s (%2$s) sent you a private message:\n\n"
+msgstr "%1$s (%2$s) enviou uma mensagem particular para você:\n\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "As caixas postais são legíveis somente pelo seu próprio usuário."
 
@@ -3415,31 +3656,39 @@ msgid "This form should automatically submit itself. "
 msgstr "Este formulário deve enviar-se automaticamente. "
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Favoritas"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Mensagens favoritas de %s"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Usuário"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Recebidas"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Suas mensagens recebidas"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Enviadas"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Suas mensagens enviadas"
 
@@ -3452,14 +3701,19 @@ msgid "Twitter integration options"
 msgstr "Opções de integração com o Twitter"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "Para"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "Não foi possível analisar a mensagem."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s e amigos, página %d"
@@ -3469,21 +3723,31 @@ msgid "You can upload your personal avatar."
 msgstr "Você pode enviar seu avatar pessoal."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Configurações do avatar"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Visualização"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Cortar"
 
@@ -3500,34 +3764,43 @@ msgid "There was a problem with your session token. "
 msgstr "Ocorreu um problema com o seu token de sessão. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Nossos dados do arquivo foi perdido."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "Nosso arquivo foi perdido."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "Tipo de arquivo desconhecido"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "Não foi especificado nenhum perfil."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "Não foi encontrado nenhum perfil com esse ID."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Bloquear usuário"
 
@@ -3535,11 +3808,11 @@ msgstr "Bloquear usuário"
 msgid "Are you sure you want to block this user? "
 msgstr "Você tem certeza que deseja bloquear esse usuário?"
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Você já bloqueou esse usuário."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "Não foi possível salvar a informação de bloqueio."
 
@@ -3556,38 +3829,49 @@ msgstr "Você está prestes a apagar permanentemente uma mensagem. "
 msgid "Add to favorites"
 msgstr "Adicionar aos favoritos"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Editar o grupo %s"
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr ""
-
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Você deve estar logado para criar um grupo."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "Nenhum apelido"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "Esse grupo não existe"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Você deve ser o administrador do grupo para editá-lo"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Use esse formulário para editar o grupo."
 
@@ -3596,14 +3880,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr "O apelido deve conter apenas letras minúsculas "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "descrição muito extensa (máximo 140 caracteres)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "Não foi possível atualizar o grupo."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "As configurações foram salvas."
 
@@ -3620,7 +3905,8 @@ msgstr "Cria um novo endereço de e-mail para publicar no; "
 msgid "Send me email when someone "
 msgstr "Envie-me um e-mail quando alguém "
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir que meus amigos chamem minha atenção e enviem-me um e-mail."
 
@@ -3630,11 +3916,9 @@ msgstr "Esse endereço de e-mail já pertence "
 
 #: actions/emailsettings.php:343
 msgid "A confirmation code was sent to the email address you added. "
-msgstr ""
-"Um código de confirmação foi enviado para o endereço de e-mail que você "
-"informou. "
+msgstr "Um código de confirmação foi enviado para o endereço de e-mail que você informou. "
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "Erro no servidor - não foi possível obter o usuário!"
 
@@ -3648,51 +3932,66 @@ msgstr "Se você deseja que o aplicativo %s atualize automaticamente "
 msgid "Allow %s to update my Facebook status"
 msgstr "Permitir que %s atualize meu status no Facebook"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Pular"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr "Nenhum conteúdo!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Paginação"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "Próximo"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "Anterior"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Obrigado por convidar seus amigos para usar o %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "Foram enviados convites para os seguintes usuários:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "Você foi convidado por %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr "Convide seus amigos para usar o %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Amigos que já utilizam o %s:"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Enviar convites"
@@ -3703,9 +4002,7 @@ msgstr "Não foi possível remover o usuário do Facebook."
 
 #: actions/facebooksettings.php:65
 msgid "There was a problem saving your sync preferences!"
-msgstr ""
-"Ocorreu um problema durante o salvamento das suas preferências de "
-"sincronização!"
+msgstr "Ocorreu um problema durante o salvamento das suas preferências de sincronização!"
 
 #: actions/facebooksettings.php:67
 msgid "Sync preferences saved."
@@ -3713,8 +4010,7 @@ msgstr "As preferências de sincronização foram salvas."
 
 #: actions/facebooksettings.php:90
 msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-"Atualizar meu status do Facebook automaticamente com as minhas mensagens."
+msgstr "Atualizar meu status do Facebook automaticamente com as minhas mensagens."
 
 #: actions/facebooksettings.php:97
 msgid "Send \"@\" replies to Facebook."
@@ -3737,12 +4033,14 @@ msgstr "Se você deseja que %s atualize automaticamente "
 msgid "Sync preferences"
 msgstr "Preferências de sincronização"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Excluir a favorita"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Mensagens populares"
 
@@ -3756,7 +4054,8 @@ msgid "The most popular notices on the site right now."
 msgstr "As etiquetas mais populares no site agora."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Usuários de destaque"
 
@@ -3765,80 +4064,40 @@ msgstr "Usuários de destaque"
 msgid "Featured users, page %d"
 msgstr "Usuários de destaque, pág. %d"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
-msgstr ""
-
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Esse usuário bloqueou o seu pedido de assinatura."
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr ""
-
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
-msgstr ""
-
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr ""
+msgstr "Logo do grupo"
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "O avatar foi atualizado."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "Não foi possível atualizar o avatar."
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr ""
-
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr ""
-
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr ""
-
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr ""
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr ""
-
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
-
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "Criar uma nova conta"
 
 #: actions/groupsearch.php:57
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr ""
-"Procurar por pessoas no %%site.name%% pelo seu nome, localização ou "
-"interesses. "
+#, php-format, fuzzy
+msgid "Search for groups on %%site.name%% by their name, location, or description. "
+msgstr "Procurar por pessoas no %%site.name%% pelo seu nome, localização ou interesses. "
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "Procurar pessoas"
@@ -3848,58 +4107,50 @@ msgstr "Procurar pessoas"
 msgid "You can send and receive notices through "
 msgstr "Você não pode enviar uma mensagem para esse usuário."
 
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr ""
-
 #: actions/imsettings.php:147
 #, fuzzy
 msgid "Send me replies through Jabber/GTalk "
 msgstr "Envie-me as mensagens via Jabber/GTalk."
 
 #: actions/imsettings.php:321
-#, fuzzy, php-format
+#, php-format, fuzzy
 msgid "A confirmation code was sent "
 msgstr "Nenhum código de confirmação."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 #, fuzzy
 msgid "You must be logged in to join a group."
-msgstr ""
-"Você deve estar autenticado para convidar outros usuários para usar o %s"
+msgstr "Você deve estar autenticado para convidar outros usuários para usar o %s"
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Você já está assinando esses usuários:"
 
-#: actions/joingroup.php:128
-#, fuzzy, php-format
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
+#, php-format, fuzzy
 msgid "Could not join user %s to group %s"
 msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 
-#: actions/joingroup.php:135
-#, fuzzy, php-format
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
+#, php-format, fuzzy
 msgid "%s joined group %s"
 msgstr "%s / Favoritas de %s"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr ""
-
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 #, fuzzy
 msgid "You must be logged in to leave a group."
-msgstr ""
-"Você deve estar autenticado para convidar outros usuários para usar o %s"
+msgstr "Você deve estar autenticado para convidar outros usuários para usar o %s"
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "Essa etiqueta não existe."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "Você não está assinando esse perfil."
@@ -3909,44 +4160,35 @@ msgstr "Você não está assinando esse perfil."
 msgid "You may not leave a group while you are its administrator."
 msgstr "Você não pode apagar o status de outro usuário."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 #, fuzzy
 msgid "Could not find membership record."
 msgstr "Não foi possível atualizar o registro do usuário."
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
+#, php-format, fuzzy
 msgid "Could not remove user %s to group %s"
 msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
-msgstr ""
-
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr ""
-
 #: actions/microsummary.php:69
 msgid "No current status"
 msgstr "Nenhum status atual"
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr ""
-
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 #, fuzzy
 msgid "Use this form to create a new group."
 msgstr "Você pode criar uma nova conta usando esse formulário. "
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "Não foi possível criar a favorita."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Não foi possível salvar a assinatura."
@@ -3961,20 +4203,20 @@ msgstr "Esse arquivo é muito grande."
 msgid "Don't send a message to yourself; "
 msgstr "Você não pode enviar uma mensagem para esse usuário."
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "Mensagem publicada"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Erro no Ajax"
 
 #: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr ""
-"Esse usuário não permite ser chamado à atenção ou ainda não confirmou ou "
-"configurou seu e-mail."
+msgid "This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr "Esse usuário não permite ser chamado à atenção ou ainda não confirmou ou configurou seu e-mail."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -3984,7 +4226,7 @@ msgstr "Chamada de atenção enviada"
 msgid "Nudge sent!"
 msgstr "Chamada de atenção enviada!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "Autenticar-se via OpenID"
@@ -4010,11 +4252,13 @@ msgstr "Encolhimento automático de URL"
 msgid "Service"
 msgstr "Serviço"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Serviço de encolhimento automático a ser utilizado."
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)."
 
@@ -4023,17 +4267,18 @@ msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)
 msgid "Change your password."
 msgstr "Altera a sua senha"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "A senha foi salva."
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Não é uma etiqueta de pessoa válida: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Usuários auto-etiquetados com %s - pág. %d"
@@ -4043,17 +4288,15 @@ msgstr "Usuários auto-etiquetados com %s - pág. %d"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Esses são os usuários que se auto-etiquetaram como \"%s\" "
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "Perfil desconhecido"
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr ""
-"Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou "
-"espaços"
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
+msgid "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr "Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou espaços"
 
 #: actions/profilesettings.php:144
 #, fuzzy
@@ -4061,47 +4304,41 @@ msgid "Automatically subscribe to whoever "
 msgstr "Assinar automaticamente à quem me assinar (melhor para não humanos)"
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Etiqueta inválida: \"%s\""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "Não foi possível salvar as etiquetas."
 
-#: actions/public.php:107
-#, fuzzy, php-format
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
+#, php-format, fuzzy
 msgid "Public timeline, page %d"
 msgstr "Mensagens públicas"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Não foi possível recuperar o fluxo público."
 
 #: actions/public.php:220
 #, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
-msgstr ""
-"Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/"
-"wiki/Microblogging)"
+msgid "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
+msgstr "Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/wiki/Microblogging)"
 
 #: actions/publictagcloud.php:57
 #, fuzzy
 msgid "Public tag cloud"
 msgstr "Fluxo de mensagens públicas"
 
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
-msgstr ""
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr ""
-
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, somente convidados podem se registrar."
 
@@ -4143,16 +4380,12 @@ msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 #: actions/register.php:432
 #, fuzzy
 msgid " except this private data: password, "
-msgstr ""
-" exceto estes dados privados: senha, endereço de e-mail, endereço de "
-"mensageiro instantâneo, número de telefone."
+msgstr " exceto estes dados privados: senha, endereço de e-mail, endereço de mensageiro instantâneo, número de telefone."
 
 #: actions/register.php:471
-#, fuzzy, php-format
+#, php-format, fuzzy
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr ""
-"Parabéns, %s! E seja bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, você "
-"pode querer..."
+msgstr "Parabéns, %s! E seja bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, você pode querer..."
 
 #: actions/register.php:495
 #, fuzzy
@@ -4163,84 +4396,76 @@ msgstr "(Você receberá uma mensagem por e-mail a qualquer momento, com "
 msgid "That's a local profile! Login to subscribe."
 msgstr "Esse é um perfil local! Autentique-se para assinar."
 
-#: actions/replies.php:118
-#, fuzzy, php-format
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
+#, php-format, fuzzy
 msgid "Replies to %s, page %d"
 msgstr "Respostas para %s"
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format, fuzzy
 msgid "%s favorite notices, page %d"
 msgstr "Mensagens favoritas de %s"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
-msgstr ""
-
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
-msgstr ""
-
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "Esse perfil não existe."
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
-msgstr ""
-
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "Mensagens"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 #, fuzzy
 msgid "Group actions"
 msgstr "Outras opções"
 
-#: actions/showgroup.php:323
-#, fuzzy, php-format
+#: actions/showgroup.php:323 actions/showgroup.php:304
+#, php-format, fuzzy
 msgid "Notice feed for %s group"
 msgstr "Mensagens de %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "Membro desde"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 #, fuzzy
 msgid "(None)"
 msgstr "(nenhum)"
 
-#: actions/showgroup.php:370
-msgid "All members"
-msgstr ""
-
 #: actions/showgroup.php:378
-#, fuzzy, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
-msgstr ""
-"Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/"
-"wiki/Microblogging)"
+#, php-format, fuzzy
+msgid "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
+msgstr "Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/wiki/Microblogging)"
 
 #: actions/showmessage.php:98
 #, fuzzy
 msgid "Only the sender and recipient "
 msgstr "Apenas o remetente e o destinatário podem ler essa mensagem."
 
-#: actions/showstream.php:73
-#, fuzzy, php-format
+#: actions/showstream.php:73 actions/showstream.php:78
+#, php-format, fuzzy
 msgid "%s, page %d"
 msgstr "Recebidas por %s - pág. %d"
 
@@ -4250,46 +4475,39 @@ msgid "'s profile"
 msgstr "Perfil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "O usuário não tem perfil."
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr ""
-
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 #, fuzzy
 msgid "User actions"
 msgstr "Outras opções"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 #, fuzzy
 msgid "Send a direct message to this user"
 msgstr "Você não pode enviar uma mensagem para esse usuário."
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 #, fuzzy
 msgid "Message"
 msgstr "Nova mensagem"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "Assinantes"
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr ""
-
 #: actions/showstream.php:542
-#, fuzzy, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
-msgstr ""
-"Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/"
-"wiki/Microblogging)"
+#, php-format, fuzzy
+msgid "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
+msgstr "Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/wiki/Microblogging)"
 
 #: actions/smssettings.php:128
 #, fuzzy
@@ -4306,7 +4524,7 @@ msgstr "Envie-me as mensagens via Jabber/GTalk."
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Aguardando a confirmação deste número de telefone."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Selecione uma operadora"
@@ -4328,22 +4546,17 @@ msgid "Subscribed"
 msgstr "Assinado"
 
 #: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format, fuzzy
 msgid "%s subscribers"
 msgstr "Assinantes"
 
-#: actions/subscribers.php:52
-#, php-format
-msgid "%s subscribers, page %d"
-msgstr ""
-
 #: actions/subscribers.php:63
 #, fuzzy
 msgid "These are the people who listen to "
 msgstr "Estas são as pessoas que acompanham as mensagens de %s."
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
+#, php-format, fuzzy
 msgid "These are the people who "
 msgstr "Estas são as pessoas que acompanham as mensagens de %s."
 
@@ -4363,24 +4576,20 @@ msgid "These are the people whose notices "
 msgstr "Estas são as pessoas cujas mensagens %s acompanha."
 
 #: actions/subscriptions.php:69
-#, fuzzy, php-format
+#, php-format, fuzzy
 msgid "These are the people whose "
 msgstr "Estas são as pessoas que acompanham as mensagens de %s."
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, fuzzy, php-format
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
+#, php-format, fuzzy
 msgid "Notices tagged with %s, page %d"
 msgstr "Mensagens etiquetadas com %s"
 
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr ""
-
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Você não está autenticado"
@@ -4399,70 +4608,64 @@ msgstr "Tag %s"
 msgid "Tag user"
 msgstr "Etiquetas"
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
-msgstr ""
-"Etiquetas desse usuário (letras, números, -, ., e _), separadas por vírgulas "
-"ou espaços"
+#: actions/tagother.php:149 actions/tagother.php:151
+msgid "Tags for this user (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr "Etiquetas desse usuário (letras, números, -, ., e _), separadas por vírgulas ou espaços"
 
 #: actions/tagother.php:164
 msgid "There was a problem with your session token."
-msgstr ""
-"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
+msgstr "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: actions/tagother.php:191 actions/tagother.php:193
+msgid "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "Você só pode etiquetar pessoas às quais assina ou que assinam você."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Não foi possível salvar as etiquetas."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
-"Use esse formulário para adicionar etiquetas aos seus assinantes ou "
-"assinados."
+msgstr "Use esse formulário para adicionar etiquetas aos seus assinantes ou assinados."
 
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Essa etiqueta não existe."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "Microblogs etiquetados com %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Não foi possível bloquear o usuário."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "Não foi possível desbloquear o usuário."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Não encontrado."
 
 #: actions/twittersettings.php:71
 msgid "Add your Twitter account to automatically send "
-msgstr ""
-"Adicione a sua conta do Twitter para enviar suas mensagens para lá "
-"automaticamente, "
+msgstr "Adicione a sua conta do Twitter para enviar suas mensagens para lá automaticamente, "
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Nome de usuário do Twitter"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Senha do Twitter"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Amigos do Twitter"
 
@@ -4475,150 +4678,147 @@ msgstr "Nome de usuário deve ter números,"
 msgid "Unable to retrieve account information "
 msgstr "Não foi possível obter informações da conta"
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "Erro na remoção do bloqueio."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "Nenhuma ID de perfil na requisição."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "Nenhum perfil com essa ID."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Cancelado"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "Grupos de %s"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Grupos de %s, página %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
 
-#: classes/Notice.php:109
-msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
-"Muitas mensagens em um período curto de tempo; dê uma respirada e publique "
-"novamente daqui a alguns minutos."
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
+msgid "Too many notices too fast; take a breather and post again in a few minutes."
+msgstr "Muitas mensagens em um período curto de tempo; dê uma respirada e publique novamente daqui a alguns minutos."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Você foi banido de publicar mensagens nesse site."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Enviar um avatar"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Outras"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Outras opções"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Página sem título"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Navegação primária no site"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Perfil pessoal e mensagens dos amigos"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Pesquisar por pessoa ou texto"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Conta"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Alterar email, avatar, senha, perfil"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Conectar por IM, SMS, Twitter"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Sair deste site"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Entrar"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Criar uma nova conta"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "Entrar com OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "Ajuda"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "Nova mensagem"
 
-#: lib/action.php:417
-msgid "Local views"
-msgstr ""
-
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "Nova mensagem"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Navegação pelas assinaturas"
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
-msgstr ""
-
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 #, fuzzy
 msgid "All "
 msgstr "Todas"
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
-msgstr ""
+msgstr "licença"
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "Bloquear usuário"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Bloquear"
 
@@ -4631,11 +4831,14 @@ msgstr "Tirar das favoritas"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "Para usar a Aplicação do Facebook %s você precisa autenticar-se"
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr " uma nova conta."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "Publicado"
 
@@ -4655,53 +4858,57 @@ msgstr "Filtrar etiquetas"
 msgid "All"
 msgstr "Todas"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Selecione uma etiqueta para reduzir a lista"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Ir"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL para seu site, blog ou perfil em outro site"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Descrição"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Descreva o grupo ou tópico em 140 caracteres."
 
-#: lib/groupeditform.php:158
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
+msgid "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Grupo"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "Admin"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Editar propriedades do grupo %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Adicionar ou editar logo de %s"
@@ -4731,11 +4938,11 @@ msgstr "Entrar"
 msgid "Leave"
 msgstr "Sair"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Autentique-se com um nome de usuário e senha"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Cadastre-se para uma nova conta"
 
@@ -4745,38 +4952,30 @@ msgstr "Autentique-se ou registre-se como um OpenID"
 
 #: lib/mail.php:175
 #, php-format
-msgid ""
-"Hey, %s.\n"
-"\n"
-msgstr ""
-"Olá, %s.\n"
-"\n"
+msgid "Hey, %s.\n\n"
+msgstr "Olá, %s.\n\n"
 
 #: lib/mail.php:236
 #, php-format
 msgid "%1$s is now listening to "
 msgstr "%1$s agora está acompanhando "
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Localização: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Site: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
-msgid ""
-"Bio: %s\n"
-"\n"
-msgstr ""
-"Descrição: %s\n"
-"\n"
+msgid "Bio: %s\n\n"
+msgstr "Descrição: %s\n\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Você teve a atenção chamada por %s"
@@ -4791,39 +4990,47 @@ msgstr "%1$s (%2$s) quer saber como você está "
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s acabou de marcar sua mensagem de %2$s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "De"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar uma mensagem direta"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "Enviar uma mensagem"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Caracteres disponíveis"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "em resposta à"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Responder a esta mensagem"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Excluir esta mensagem"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Excluir"
 
@@ -4844,27 +5051,29 @@ msgstr "Chame a atenção deste usuário"
 msgid "Tags in %s's notices"
 msgstr "Etiquetas nas mensagens de %s"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Público"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos de usuário"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etiquetas recentes"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Destacada"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
@@ -4880,31 +5089,33 @@ msgstr "Procurar por grupos neste site"
 msgid "Untitled section"
 msgstr "Seção sem título"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Pessoas que %s assina"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Assinantes de %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "O grupo %s é membro de"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convide seus amigos e colegas para unir-se a você no %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "O usuário bloqueou você."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Assinar este usuário"
 
@@ -4917,10 +5128,11 @@ msgid "Top posters"
 msgstr "Quem mais publica"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Desbloquear este usuário"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Desbloquear"
 
@@ -4928,40 +5140,934 @@ msgstr "Desbloquear"
 msgid "Unsubscribe from this user"
 msgstr "Cancelar a assinatura deste usuário"
 
-#~ msgid "Code not yet ready."
-#~ msgstr "O código ainda não está pronto."
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, php-format, fuzzy
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, php-format, fuzzy
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, php-format, fuzzy
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s e amigos"
+
+#: actions/avatarsettings.php:78
+#, php-format, fuzzy
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Você pode enviar seu avatar pessoal."
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "O avatar foi atualizado."
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid "You are about to permanently delete a notice. Once this is done, it cannot be undone."
+msgstr "Você está prestes a apagar permanentemente uma mensagem. Isso não poderá ser desfeito."
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Envie-me um e-mail quando alguém enviar-me uma mensagem particular."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, php-format, fuzzy
+msgid "Microblog by %s group"
+msgstr "Microblog por %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, php-format, fuzzy
+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 "Procurar por pessoas em %%site.name%% por seus nomes, localidade ou interesses. Separe os termos da busca com espaços; eles devem ter 3 caracteres ou mais."
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Ocorreu um erro durante o envio da mensagem direta."
+
+#: actions/noticesearch.php:91
+#, php-format, fuzzy
+msgid "Search results for \"%s\" on %s"
+msgstr " Procurar por \"%s\" no fluxo de mensagens"
+
+#: actions/openidlogin.php:66
+#, php-format, fuzzy
+msgid "For security reasons, please re-login with your [OpenID](%%doc.openid%%) before changing your settings."
+msgstr "Por razões de segurança, por favor, digite novamente seu nome de usuário e senha antes de alterar suas configurações."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Feed de mensagens públicas"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Feed de mensagens públicas"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Feed de mensagens públicas"
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid " except this private data: password, email address, IM address, and phone number."
+msgstr " exceto estes dados privados: senha, endereço de e-mail, endereço de IM, número de telefone."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Criar"
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Esse perfil não existe."
+
+#: actions/showstream.php:149
+#, php-format, fuzzy
+msgid "%s's profile"
+msgstr "Perfil"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, php-format, fuzzy
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed de mensagens de %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, php-format, fuzzy
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed de mensagens de %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, php-format, fuzzy
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed de mensagens de %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format, fuzzy
+msgid "FOAF for %s"
+msgstr "Envidas para %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Configurações do perfil"
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. Check your phone for the code and instructions on how to use it."
+msgstr "Um código de confirmação foi enviado para o número de telefone que você informou. Verifique sua caixa de entrada (e de spam!) para o código e instruções sobre como usá-lo."
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Esse usuário não existe"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid "Add your Twitter account to automatically send  your notices to Twitter, and subscribe to Twitter friends already here."
+msgstr "Adicione a sua conta do Twitter para enviar suas mensagens para lá automaticamente, "
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, php-format, fuzzy
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Não foi possível obter as informações da conta \"%s\" no Twitter."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 "Por favor, verifique estes detalhes para ter certeza que você quer seguir as mensagens deste usuário. Se você não solicitou seguir as mensagens de alguém, clique em \"Cancelar\"."
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Pesquisar por pessoa ou texto"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid "Too many duplicate messages too quickly; take a breather and post again in a few minutes."
+msgstr "Muitas mensagens em um período curto de tempo; dê uma respirada e publique novamente daqui a alguns minutos."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Conectar por IM, SMS, Twitter"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Chamar a atenção"
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, php-format, fuzzy
+msgid "To use the %s Facebook Application you need to login with your username and password. Don't have a username yet? "
+msgstr "Para usar a Aplicação do Facebook %s você precisa autenticar-se"
+
+#: lib/mail.php:241 lib/mail.php:240
+#, php-format, fuzzy
+msgid "%1$s is now listening to your notices on %2$s.\n\n	%3$s\n\n%4$s%5$s%6$s\nFaithfully yours,\n%7$s.\n\n----\nChange your email address or notification options at %8$s\n"
+msgstr "%1$s agora está acompanhando suas mensagens em %2$s.\n\n	%3$s\n\nCordialmente,\n%4$s.\n"
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Procurar"
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Esse documento não existe."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Bloquear usuário"
+
+#: actions/blockedfromgroup.php:90
+#, php-format, fuzzy
+msgid "%s blocked profiles"
+msgstr "O usuário não tem perfil."
+
+#: actions/blockedfromgroup.php:93
+#, php-format, fuzzy
+msgid "%s blocked profiles, page %d"
+msgstr "%s e amigos, página %d"
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Não foi possível desbloquear o usuário."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Código de confirmação"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Não é possível excluir esta mensagem."
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, php-format, fuzzy
+msgid "Invalid alias: \"%s\""
+msgstr "Etiqueta inválida: \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, php-format, fuzzy
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Este apelido já está em uso. Tente outro."
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Não foi possível criar a favorita."
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nova mensagem"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nova mensagem"
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Não é um apelido válido."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Não foi especificado nenhum perfil."
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "O usuário bloqueou você."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Você não está assinando esse perfil."
 
-#~ msgid "Export and delete your user information."
-#~ msgstr "Exportar e excluir as informações do seu usuário."
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Bloquear usuário"
 
-#~ msgid "Delete my account"
-#~ msgstr "Excluir a minha conta"
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Você deve estar logado para criar um grupo."
 
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Confirmação de exclusão da minha conta"
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Outras opções"
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Não foi possível atualizar o usuário."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Não foi possível salvar suas configurações do Twitter!"
 
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Verifique se você deseja realmente excluir sua conta."
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "As preferências de sincronização foram salvas."
 
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Exibir as mensagens populares recentes"
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Você deve ser o administrador do grupo para editá-lo"
 
-#~ msgid "Tag a person"
-#~ msgstr "Etiquetar uma pessoa"
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Admin"
 
-#~ msgid "List"
-#~ msgstr "Lista"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Nenhum resultado"
 
-#~ msgid "Icons"
-#~ msgstr "�cones"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "O usuário bloqueou você."
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Nova mensagem"
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Não foi possível salvar o perfil."
+
+#: actions/openidsettings.php:70
+#, php-format, fuzzy
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites with the same user account. Manage your associated OpenIDs from here."
+msgstr "A [OpenID](%%doc.openid%%) permite que você autentique-se em vários sites com a mesma conta de usuário. Gerencie suas OpenIDs associadas aqui."
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Configurações do perfil"
+
+#: actions/public.php:245 actions/public.php:238
+#, php-format, fuzzy
+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 "Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/wiki/Microblogging)"
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid "If you've forgotten or lost your password, you can get a new one sent to the email address you have stored in your account."
+msgstr "Se você esqueceu ou perdeu sua senha, você pode receber uma nova no endereço de e-mail que armazenou em sua conta."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Você foi identificado. Informe uma nova senha abaixo."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Foi solicitada a recuperação da senha"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Erro com o código de confirmação."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Assinar este usuário"
+
+#: actions/showfavorites.php:79
+#, php-format, fuzzy
+msgid "%s's favorite notices, page %d"
+msgstr "Mensagens favoritas de %s"
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, php-format, fuzzy
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Mensagens de %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, php-format, fuzzy
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Mensagens de %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, php-format, fuzzy
+msgid "Notice feed for %s group (Atom)"
+msgstr "Mensagens de %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, php-format, fuzzy
+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 "Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/wiki/Microblogging)"
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Admin"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Não é um usuário local."
+
+#: actions/showstream.php:72
+#, php-format, fuzzy
+msgid " tagged %s"
+msgstr "Mensagens etiquetadas com %s"
+
+#: actions/showstream.php:121
+#, php-format, fuzzy
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Mensagens de %s"
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, php-format, fuzzy
+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 "Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/wiki/Microblogging)"
+
+#: actions/subscriptions.php:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, php-format, fuzzy
+msgid "%s is not listening to anyone."
+msgstr "%1$s agora está acompanhando "
+
+#: actions/tag.php:77 actions/tag.php:86
+#, php-format, fuzzy
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed de mensagens de %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, php-format, fuzzy
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed de mensagens de %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Essa mensagem já é uma favorita!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Essa mensagem não é uma favorita!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Não foi possível recuperar o fluxo público."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "Nenhum destinatário especificado."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Não foi possível encontrar nenhum status."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, php-format, fuzzy
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Atualizações respondendo à %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, php-format, fuzzy
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Atualizações de %1$s no %2$s!"
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s assinaturas"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Configurações do perfil"
+
+#: actions/usergroups.php:153
+#, php-format, fuzzy
+msgid "%s is not a member of any group."
+msgstr "Você não está assinando esse perfil."
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problema ao salvar a mensagem."
+
+#: classes/User.php:319 classes/User.php:327
+#, php-format, fuzzy
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Mensagem para %1$s no %2$s"
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "O usuário não tem perfil."
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Perfil"
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Enviar"
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Altere a sua senha"
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Conectar"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Procurar"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Lista"
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Bloquear"
+
+#: lib/groupnav.php:101
+#, php-format, fuzzy
+msgid "%s blocked users"
+msgstr "Bloquear usuário"
+
+#: lib/groupnav.php:119
+#, php-format, fuzzy
+msgid "Add or edit %s design"
+msgstr "Adicionar ou editar logo de %s"
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Nenhum conteúdo!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Usuário"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Procurar"
+
+#: lib/webcolor.php:82
+#, php-format, fuzzy
+msgid "%s is not a valid color!"
+msgstr "A URL do site informada não é válida."
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Essa etiqueta não existe."
+
+#: actions/apidirectmessage.php:89
+#, php-format, fuzzy
+msgid "Direct messages from %s"
+msgstr "Mensagem direta para %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format, fuzzy
+msgid "That's too long. Max message size is %d chars."
+msgstr "Muito extenso. O tamanho máximo das mensagens é 140 caracteres."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Não é possível seguir o usuário: Usuário não encontrado."
+
+#: actions/apigroupcreate.php:261
+#, php-format, fuzzy
+msgid "Description is too long (max %d chars)."
+msgstr "descrição muito extensa (máximo 140 caracteres)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Você já está assinando esses usuários:"
+
+#: actions/apigroupjoin.php:138
+#, php-format, fuzzy
+msgid "Could not join user %s to group %s."
+msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Você não está assinando esse perfil."
+
+#: actions/apigroupleave.php:124
+#, php-format, fuzzy
+msgid "Could not remove user %s to group %s."
+msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
+
+#: actions/apigrouplist.php:95
+#, php-format, fuzzy
+msgid "%s's groups"
+msgstr "Grupos de %s"
+
+#: actions/apigrouplist.php:103
+#, php-format, fuzzy
+msgid "Groups %s is a member of on %s."
+msgstr "O grupo %s é membro de"
+
+#: actions/apigrouplistall.php:94
+#, php-format, fuzzy
+msgid "groups on %s"
+msgstr "Outras opções"
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format, fuzzy
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres."
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Formato de imagem não suportado."
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, php-format, fuzzy
+msgid "description is too long (max %d chars)."
+msgstr "descrição muito extensa (máximo 140 caracteres)."
+
+#: actions/favoritesrss.php:115
+#, php-format, fuzzy
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Atualizações de %1$s no %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "O usuário que está está sendo acompanhado não existe."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Não autorizado."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Não foi possível converter os tokens de requisição para tokens de acesso."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Versão desconhecida do protocolo OMB."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Essa mensagem não existe."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Nosso arquivo foi perdido."
+
+#: actions/grouprss.php:133
+#, php-format, fuzzy
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Atualizações de %1$s no %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Esta página não está disponível em um "
+
+#: actions/login.php:259
+#, php-format, fuzzy
+msgid "Login with your username and password. Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr "Logar-se com seu nome de usuário e senha. Não tem um nome de usuário ainda? [Registre](%%action.register%%) uma nova conta, ou use uma [OpenID](%%action.openidlogin%%)."
+
+#: actions/noticesearchrss.php:91
+#, php-format, fuzzy
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Todas as atualizações correspondentes ao termo \"%s\""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, php-format, fuzzy
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, php-format, fuzzy
+msgid "Bio is too long (max %d chars)."
+msgstr "Descrição muito extensa (máximo 140 caracteres)."
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Não é uma URL de perfil válida (nenhum documento YADIS)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Esse é um perfil local! Autentique-se para assinar."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Não foi possível obter um token de requisição."
+
+#: actions/replies.php:158
+#, php-format, fuzzy
+msgid "Replies feed for %s (Atom)"
+msgstr "Mensagens de %s"
+
+#: actions/repliesrss.php:72
+#, php-format, fuzzy
+msgid "Replies to %1$s on %2$s!"
+msgstr "Mensagem para %1$s no %2$s"
+
+#: actions/showfavorites.php:170
+#, php-format, fuzzy
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed para favoritas de %s"
+
+#: actions/showfavorites.php:177
+#, php-format, fuzzy
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed para favoritas de %s"
+
+#: actions/showfavorites.php:184
+#, php-format, fuzzy
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed para favoritas de %s"
+
+#: actions/showgroup.php:345
+#, php-format, fuzzy
+msgid "FOAF for %s group"
+msgstr "Mensagens de %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Mensagem publicada"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Esta página não está disponível em um "
+
+#: actions/tag.php:92
+#, php-format, fuzzy
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed de mensagens de %s"
+
+#: 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 "Por favor, verifique estes detalhes para ter certeza que você quer seguir as mensagens deste usuário. Se você não solicitou seguir as mensagens de alguém, clique em \"Cancelar\"."
+
+#: actions/userauthorization.php:249
+#, 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 "A assinatura foi autorizada, mas não foi informada nenhuma URL de retorno. Verifique as instruções do site para detalhes sobre como autorizar a assinatura. Seu token de assinatura é:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid "The subscription has been rejected, but no callback URL was passed. Check with the site’s instructions for details on how to fully reject the subscription."
+msgstr "A assinatura foi rejeitada, mas não foi informada nenhuma URL de retorno. Verifique as instruções do site para maiores detalhes em como rejeitar completamente a assinatura."
+
+#: actions/userauthorization.php:343
+#, php-format, fuzzy
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Não é possível ler a URL '%s' do avatar"
+
+#: actions/userauthorization.php:348
+#, php-format, fuzzy
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Tipo de imagem errado para '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Não foi possível redirecionar para o servidor: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Procure no conteúdo das mensagens"
+
+#: lib/command.php:88
+#, php-format, fuzzy
+msgid "Could not find a user with nickname %s"
+msgstr "Não foi possível atualizar o usuário com o endereço de e-mail confirmado."
+
+#: lib/command.php:99
+#, php-format, fuzzy
+msgid "Nudge sent to %s"
+msgstr "Chamada de atenção enviada"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format, fuzzy
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d"
+
+#: lib/command.php:431
+#, php-format, fuzzy
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d"
+
+#: lib/command.php:439
+#, php-format, fuzzy
+msgid "Reply to %s sent"
+msgstr "Responder a esta mensagem"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problema ao salvar a mensagem."
+
+#: lib/common.php:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Nenhum código de confirmação."
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Entrar"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Selecione uma operadora"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Descreva o grupo ou tópico em 140 caracteres."
+
+#: lib/groupeditform.php:170
+#, php-format, fuzzy
+msgid "Describe the group or topic in %d characters"
+msgstr "Descreva o grupo ou tópico em 140 caracteres."
+
+#: lib/jabber.php:192
+#, php-format, fuzzy
+msgid "notice id: %s"
+msgstr "Feed de mensagens de %s"
+
+#: lib/mail.php:554
+#, php-format, fuzzy
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s marcaram sua mensagem como favorita"
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " de "
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Não foi possível excluir a favorita."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Excluir a mensagem"
 
-#~ msgid ""
-#~ "Hey, %s.\n"
-#~ "\n"
-#~ "Someone just entered this email address on %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Olá %s.\n"
-#~ "\n"
-#~ "Alguém acabou de digitar esse endereço de e-mail no %s.\n"
-#~ "\n"
diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo
index c4066c65e..f5336ee74 100644
--- a/locale/ru/LC_MESSAGES/statusnet.mo
+++ b/locale/ru/LC_MESSAGES/statusnet.mo
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 8a553a37f..309f1164a 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -1,54 +1,55 @@
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Russian
 #
+# Author@translatewiki.net: �лек�андр Сигачёв
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-04-01 16:09+0000\n"
-"Last-Translator: motherfuker <meelana@list.ru>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:29+0000\n"
+"Language-Team: Russian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr ""
+msgstr "Пои�ковый поток дл� «%s»"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
+"за и�ключением �ледующих личных данных: парол�, адре�а �лектронной почты, IM-"
+"адре�а, номера телефона."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
-msgstr ""
+msgstr "от "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgstr "%1$s / Обновлени� в ответ %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s пригла�ил ва� при�оединить�� к нему на %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -78,11 +79,38 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
+"%1$s пригла�ил ва� при�оединить�� к нему на %2$s (%3$s).\n"
+"\n"
+"%2$s — �ерви� микроблоггинга, позвол�ющий держать контакт � людьми, которых "
+"вы знаете и которые вам интере�ны.\n"
+"\n"
+"Вы также можете поделить�� ново�т�ми о �ебе, вашими мы�л�ми или вашей онлайн-"
+"жизнью �о знающими ва� людьми. Этот �ерви� также отлично подходит дл� "
+"в�тречи � новыми людьми, раздел�ющими ваши интере�ы.\n"
+"\n"
+"%1$s говорит:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Вы можете увидеть �траницу профил� %1$s на %2$s зде�ь:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Е�ли вы хотите опробовать данный �ерви�, нажмите на приведённую ниже ��ылку, "
+"чтобы прин�ть приглашение.\n"
+"\n"
+"%6$s\n"
+"\n"
+"В противном �лучае вы можете проигнорировать �то �ообщение. Спа�ибо за ваше "
+"терпение и врем�.\n"
+"\n"
+"С уважением, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "%1$s �ейча� �лушает ваши заметки на %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
@@ -96,140 +124,164 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
-msgstr "%s Публична� Лента"
+msgstr "%s публична� лента"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
 #: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s и друзь�"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
-msgstr "%s обща� лента"
+msgstr "%s обща� хронологи�"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s �тату�"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s хронологи�"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s обновлен дл� в�ех!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
-"(Вам �разу же по�лано �ообщение по �лектронной почте, � ин�трукци�ми по "
-"тому, как подтвердить �вой �лектронный адре�.)"
+"(Вы должный получить пи�ьмо � опи�анием того, как подтвердить �вой "
+"�лектронный адре�.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** �то �ерви� микроблогинга �озданный дл� Ва� при помощи "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** — �то �ерви� микроблогинга, �озданный дл� ва� при помощи [%"
+"%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** - �ерви� микроблогинга. "
+msgstr "**%%site.name%%** — �ерви� микроблогинга. "
 
 #: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Создатель определ�ет�� по полному имени или нику."
+msgstr ". �вторы должны определ�ть�� по полному имени или нику."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 латин�ких �трочных букв или цифр, без пробелов"
+msgstr "1-64 латин�ких �трочных буквы или цифры, без пробелов"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 латин�ких �трочных букв или цифр, без пробелов. Об�зательное поле."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 или больше знаков"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 или более �имволов, и не забывайте его!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 или более �имволов. Об�зательное поле."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
-"Код подтверждени� вы�лан на Ваш IM-адре�, который Вы добавили. Вы должны "
-"подтвердить %s дл� ра��ылки �ообщений Вам."
+"Код подтверждени� вы�лан на добавленный вами IM-адре�. Вы должны подтвердить "
+"%s дл� отправки вам �ообщений."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"Код подтверждени� вы�лан на �лектронный адре�, который Вы добавили. "
-"Про�мотрите Вашу �лектронный почтовый �щик (и папку дл� �пама тоже!) дл� "
-"нахождени� �того кода и ин�трукций по его и�пользованию."
+"Код подтверждени� вы�лан на добавленный вами �лектронный адре�. Про�мотрите "
+"папку вход�щей почты (а также папку �пама!), чтобы найти �тот кода и "
+"ин�трукции по его и�пользованию."
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your inbox "
 "(and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"Код подтверждени� вы�лан на мобильный номер, который вы добавили.  "
-"По�мотрите Ваши вход�щие �ообщени� (и папку дл� �пама тоже!) дл� нахождени� "
-"�того кода и ин�трукций по его и�пользованию."
+"Код подтверждени� вы�лан на добавленный вами номер телефона. По�мотрите ваши "
+"вход�щие (а также папку �пама!), чтобы найти �тот код и ин�трукции по его "
+"и�пользованию."
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -249,7 +301,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Метод API не найден!"
 
@@ -272,16 +351,23 @@ msgstr "Метод API не найден!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "Метод API рекон�труирует��."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "О проекте"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Прин�ть"
 
@@ -292,6 +378,9 @@ msgstr "Прин�ть"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Добавить"
 
@@ -309,60 +398,69 @@ msgstr "Добавить или удалить OpenID"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "�дре�"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "�дре�а друзей, которых ты хочешь пригла�ить (по одному на �трочку)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "В�е подпи�ки."
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "В�е обновлени� дл� %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
-msgstr "В�е обновлени� �оответ�твующие пои�ковому термину \"%s\""
+msgstr "В�е обновлени�, �оответ�твующие пои�ковому запро�у «%s»"
 
 #: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
 #: ../actions/openidlogin.php:29 ../actions/register.php:30
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Уже авторизован."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Уже подпи�ан!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Вы уверены, что хотите удалить �ту запи�ь?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
-msgstr "�вторизованна� подпи�ка"
+msgstr "�вторизовать подпи�ку"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "�втоматиче�кий повторный вход. �е дл� публичных компьютеров!"
+msgstr "�втоматиче�кии входить в дальнейшем. �е дл� общедо�тупных компьютеров!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "�втоматиче�ки подпи�ывать�� на в�ех, кто подпи�ал�� на мен�"
@@ -370,25 +468,30 @@ msgstr "Ð�втоматичеÑ�ки подпиÑ�ыватьÑ�Ñ� на вÑ�ех, кÑ
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "�ватар"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "�ватар обновлён."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, 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 ""
-"В ожидании подтверждени� �того адре�а. Проверьте Ваш Jabber/GTalk - аккаунт "
-"на предмет �ообщени� � дальнейшими ин�трукци�ми. (Вы включили %s в Ваш "
-"контактный �пи�ок?)"
+"В ожидании подтверждени� �того адре�а. Проверьте ваш Jabber/GTalk на предмет "
+"�ообщени� � дальнейшими ин�трукци�ми. (Вы включили %s в ваш �пи�ок "
+"контактов?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -397,7 +500,7 @@ msgstr ""
 "�пама!), там будут дальнейшие ин�трукции."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "В ожидании подтверждени� данного номера телефона."
 
@@ -408,6 +511,8 @@ msgstr "Ранее »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Био"
 
@@ -415,23 +520,27 @@ msgstr "Био"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Слишком длинное био (мак�имум 140 �имволов)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "�е удаёт�� удалить �ту запи�ь."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr "�е удает�� прочитать URL аватары из '%s'"
+msgstr "�е удаёт�� прочитать URL аватары «%s»"
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "�е удаёт�� �охранить новый пароль."
 
@@ -439,31 +548,34 @@ msgstr "�е удаёт�� �охранить новый пароль."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Отменить"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "�е удаёт�� подтвердить OpenID."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "�е удаёт�� �тандартизировать �тот Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "�е удаёт�� �тандартизировать �тот �лектронный адре�"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Изменить"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Изменить �лектронный адре�"
 
@@ -473,13 +585,14 @@ msgid "Change password"
 msgstr "Изменить пароль"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
-msgstr "Изменить Ваш пароль"
+msgstr "Изменить ваш пароль"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
-msgstr "�а�тройки Ваших у�тановок профил�"
+msgstr "Изменить ваши на�тройки профил�"
 
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -487,6 +600,9 @@ msgstr "�а�тройки Ваших у�тановок профил�"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Подтвердить"
 
@@ -499,12 +615,14 @@ msgstr "Подтвердить адре�"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Подтверждение отменено."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Код подтверждени�"
 
@@ -513,7 +631,8 @@ msgstr "Код подтверждени�"
 msgid "Confirmation code not found."
 msgstr "Код подтверждени� не найден."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -532,38 +651,40 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 "�аши поздравлени�, %s! И добро пожаловать на %%%%site.name%%%%. Зде�ь вы "
-"можете ...\n"
+"можете…\n"
 "\n"
-"* Перейти на [ваш микроблог](%s) и запо�тить вашу первую запи�ь.\n"
-"* Добавить ваш [Jabber/GTalk - аккаунт](%%%%action.imsettings%%%%) так что "
-"вы �можете по�ле �того отправл�ть запи�и через ме��енджеры.\n"
-"* [И�кать людей](%%%%action.peoplesearch%%%%), которых вы возможно знаете "
+"* Перейти на [ваш микроблог](%s) и опубликовать вашу первую запи�ь.\n"
+"* Добавить ваш [адре� Jabber/GTalk](%%%%action.imsettings%%%%), дл� "
+"возможно�ти отправл�ть запи�и через мгновенные �ообщени�.\n"
+"* [�айти людей](%%%%action.peoplesearch%%%%), которых вы, возможно, знаете, "
 "или � которыми раздел�ете одни и те же интере�ы.\n"
-"* �е нашли друзей или знакомых? [Пригла�ите их](%%%%action.invite%%%%) на "
-"%%%%site.name%%%%, подпишите�ь на них и будьте в�егда в кур�е.\n"
-"* Обновить ваши [профильные на�тройки](%%%%action.profilesettings%%%%) чтобы "
+"* Обновить ваши [на�тройки профил�](%%%%action.profilesettings%%%%), чтобы "
 "больше ра��казать другим о �ебе.\n"
-"* Прочитать [документацию](%%%%doc.help%%%%) чтобы поподробнее узнать об "
-"о�обенно�т�х данного в�б �ерви�а и о том как его и�пользовать.\n"
+"* Прочитать [документацию](%%%%doc.help%%%%), чтобы узнать о возможно�т�х, о "
+"которые вы можете не знать.\n"
 "\n"
-"Спа�ибо за то, что при�оединили�ь к нам и надеем��, что вы получите "
+"Спа�ибо за то, что при�оединили�ь к нам, надеем��, что вы получите "
 "удоволь�твие от и�пользовани� данного �ерви�а!"
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Соединить"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Соединить � �уще�твующей запи�ью"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Контакты"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "�е удаёт�� �оздать OpenID-форму: %s "
@@ -571,36 +692,41 @@ msgstr "�е удаёт�� �оздать OpenID-форму: %s "
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "�е удает�� включить %s в �пи�ок поддержки, он уже в Вашем �пи�ке."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr ""
-"�е удаёт�� �ледовать пользователю, т.к. такого пользовател� не �уще�твует."
+"�е удаёт�� �ледовать за пользователем, т. к. такого пользовател� не "
+"�уще�твует."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "�е удаёт�� перенаправить на �ервер: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "�е удаёт�� �охранить информацию об аватаре"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "�е удаёт�� �охранить новую информацию профил�"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
-msgstr "�е удаёт�� подпи�ать других на Вашу ленту."
+msgstr "�е удаёт�� подпи�ать других на вашу ленту."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Подпи�ка неудачна."
 
@@ -620,15 +746,17 @@ msgstr "Ð�е удаётÑ�Ñ� преобразовать запроÑ�Ñ‹ в доÑ�Ñ
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "�е удаёт�� удалить подверждение по �лектронному адре�у."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "�е удаёт�� удалить подпи�ку."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "�ет �тату�ов."
 
@@ -641,29 +769,38 @@ msgstr "�е удаёт�� получить запро�."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "�е удаёт�� в�тавить код подтверждени�."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "�е удаёт�� в�тавить новую подпи�ку."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "�е удаёт�� �охранить профиль."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "�е удаёт�� обновить пользовател� дл� автоподпи�ки."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "�е удаёт�� обновить пользователь�кую запи�ь."
 
@@ -679,44 +816,50 @@ msgstr "�е удаёт�� обновить пользователь�кую з
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "�е удаёт�� обновить пользовател�."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Создать"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Создать нового пользовател� � таким именем."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
-msgstr "Создать новую учетную запи�ь"
+msgstr "Создать новую учётную запи�ь"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 "Создать новую учетную запи�ь дл� OpenID, у которого уже е�ть пользователь."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Подтверждённый в на�то�щее врем� Jabber/Gtalk - адре�."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 "Подтверждённый в на�то�щее врем� SMS-до�тупный номер мобильного телефона."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Подтверждённый в на�то�щее врем� �лектронный адре�."
 
@@ -725,23 +868,27 @@ msgid "Currently"
 msgstr "Сейча�"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Ошибка баз данных при в�тавке хеш-тегов дл� %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Ошибка баз данных при в�тавке ответа дл� %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Удалить запи�ь"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Опиши �еб� и �вои увлечени� при помощи 140 �имволов"
 
@@ -749,11 +896,13 @@ msgstr "Опиши �еб� и �вои увлечени� при помощи 1
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Email"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Электронный адре�"
 
@@ -763,39 +912,43 @@ msgid "Email Settings"
 msgstr "�а�тройка почты"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Такой �лектронный адре� уже задей�твован."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Подтверждение �лектронного адре�а"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Электронный адре� вида \"UserName@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Почтовый адре�"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Введите им� или �лектронный адре�."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Введите код, который вы получили по телефону."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Ошибка авторизации входа"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Ошибка при �оединении пользовател� � OpenID."
 
@@ -806,39 +959,46 @@ msgstr "Ошибка при �оединении пользовател�."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Ошибка при в�тавке аватара"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Ошибка при в�тавке нового профил�"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Ошибка в�тавки удалённого профил�"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Ошибка �охранени� подтверждённого адре�а."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Ошибка �охранени� удалённого профил�"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Ошибка �охранени� текущего профил�."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Ошибка �охранени� текущего пользовател�."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Ошибка �охранени� пользовател�; неверное им�."
 
@@ -847,6 +1007,9 @@ msgstr "Ошибка �охранени� пользовател�; неверн
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Ошибка в у�тановках пользовател�."
 
@@ -857,6 +1020,7 @@ msgstr "Ошибка обновлени� профил�"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Ошибка обновлени� удалённого профил�"
 
@@ -866,33 +1030,36 @@ msgid "Error with confirmation code."
 msgstr "Ошибка, �в�занна� � кодом подтверждени�."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Суще�твующее им�"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "ЧаВо"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "�еудача при обновлении аватара."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Лента друзей %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Лента ответов %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Лента тегов %s"
@@ -907,7 +1074,7 @@ msgstr "�айти запи�ь по �одержимому"
 msgid "Find people on this site"
 msgstr "�айти человека на �том �айте"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -920,6 +1087,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Полное им�"
 
@@ -928,23 +1100,33 @@ msgstr "Полное им�"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Полное им� �лишком длинное (не больше 255 знаков)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Помощь"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Моё"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Главна�"
 
@@ -952,21 +1134,27 @@ msgstr "Главна�"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "URL Главной �траницы неверен."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Я хочу отправл�ть запи�и по �лектронной почте."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM-адре�"
 
@@ -976,7 +1164,7 @@ msgid "IM Settings"
 msgstr "IM-у�тановки"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -984,7 +1172,7 @@ msgstr ""
 "Е�ли у ва� уже е�ть аккаунт, то авторизуйте�ь � вашим ником и паролем, чтобы "
 "�оединить их � вашим OpenID."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -992,7 +1180,7 @@ msgstr ""
 "Е�ли вы хотите добавить OpenID к вашему аккаунту, то введите его в поле ниже "
 "и нажмите на кнопку \"Добавить\""
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1003,25 +1191,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Вход�щий �лектронный адре�"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Вход�щий �лектронный адре� удалён."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "�екорректный �тарый пароль"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "�екорректное им� или пароль."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1030,30 +1224,31 @@ msgstr ""
 "указали при реги�трации вашего аккаунта."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "�еверный URL-адре� аватара '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "�еверный �лектронный адре�: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "�еверна� домашн�� �траничка дл� '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "�еверный URL лицензии дл� '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "�еверный контент запи�и"
 
@@ -1068,13 +1263,13 @@ msgid "Invalid notice url"
 msgstr "�еверный URL запи�и"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "�еверный URL профил� дл� '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "�еверный URL профил� (плохой формат)"
 
@@ -1092,45 +1287,53 @@ msgstr "�еверный размер."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "�еверное им� или пароль."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Приглашение(�) ото�лано(ы)"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Приглашение(�) ото�лано(ы) �ледующим адре�атам:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Пригла�ить"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Пригла�ить новых пользователей"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 ""
-"Этот �ерви� работает при помощи [StatusNet](http://status.net/) - программного "
-"обе�печени� дл� микроблогинга, вер�ии %s, до�тупного под лицензией [GNU "
-"Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-"
-"3.0.html)."
+"Этот �ерви� работает при помощи [StatusNet](http://status.net/) - "
+"программного обе�печени� дл� микроблогинга, вер�ии %s, до�тупного под "
+"лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/"
+"licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Этот Jabber ID уже и�пользует�� другим пользователем."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1141,12 +1344,14 @@ msgstr ""
 "ме��енджере или в GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Язык"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Слишком длинный �зык (более 50 �имволов). "
 
@@ -1155,7 +1360,15 @@ msgstr "Слишком длинный �зык (более 50 �имволов).
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Ме�тора�положение"
 
@@ -1164,7 +1377,12 @@ msgstr "Ме�тора�положение"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Слишком длинное ме�тора�положение (мак�имум 255 знаков)."
 
@@ -1173,44 +1391,52 @@ msgstr "Слишком длинное ме�тора�положение (мак
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Вход"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Вход при помощи [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
 "(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
 "%). "
 msgstr ""
-"Вход � вашим ником и паролем. �ет аккаунта? "
-"[Зареги�трируйте](%%action.register%%) новый аккаунт, или попробуйте "
-"авторизовать�� при помощи [OpenID](%%action.openidlogin%%). "
+"Вход � вашим ником и паролем. �ет аккаунта? [Зареги�трируйте](%%action."
+"register%%) новый аккаунт, или попробуйте авторизовать�� при помощи [OpenID]"
+"(%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Выход"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Полное им�, предпочтительно Ваше на�то�щее им�"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Потер�ли или забыли пароль?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Создать новый �лектронный адре� дл� по�тинга зде�ь; отменить один из �тарых."
@@ -1222,16 +1448,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Управление проце��ом получени� �лектронного адре�а � %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Реги�траци�"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Микроблог от %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1244,42 +1472,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Мои тек�ты и файлы наход�т�� под лицензией"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "�овое"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "�овый �лектронный адре� дл� по�тинга %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "�овый вход�щий �лектронный адре� добавлен."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "�овое им�"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "�ова� запи�ь"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "�овый пароль"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "�овый пароль у�пешно �охранён. Вы авторизовали�ь."
 
@@ -1289,7 +1525,13 @@ msgstr "�овый пароль у�пешно �охранён. Вы автор
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Им�"
 
@@ -1298,7 +1540,12 @@ msgstr "Им�"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Такое им� уже и�пользует��. Попробуйте какое-нибудь другое."
 
@@ -1307,48 +1554,59 @@ msgstr "Такое им� уже и�пользует��. Попробуйте
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Им� должно �о�то�ть только из пропи�ных букв и цифр и не иметь пробелов."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Такое им� недопу�тимо."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Им� пользовател�, которому Вы хотите �ледовать"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Им� или �лектронный адре�"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "�ет"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "�е Jabber ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "�е авторизованный запро�!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Провайдер не выбран."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Код не введён"
 
@@ -1360,11 +1618,15 @@ msgstr "�ет кода подтверждени�."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "�ет контента!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "�ет �лектронного адре�а."
 
@@ -1373,7 +1635,9 @@ msgid "No id."
 msgstr "�ет идентификатора."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "�ет вход�щего �лектронного адре�а."
 
@@ -1384,6 +1648,7 @@ msgstr "�ет имени пред�тавленного удалённым �е
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "�ет имени."
 
@@ -1391,12 +1656,14 @@ msgstr "�ет имени."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "�ет подтверждени� отказа."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "�ет номера телефона."
 
@@ -1406,7 +1673,8 @@ msgid "No profile URL returned by server."
 msgstr "�ет URL профил�, который вернул �ервер."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "�ет зареги�трированных �лектронных адре�ов дл� �того пользовател�."
 
@@ -1418,7 +1686,7 @@ msgstr "Запро�ы не найдены!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "�ет результатов."
 
@@ -1429,12 +1697,16 @@ msgstr "�ет размера."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "�ет �тату�а � таким ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "�е найдено �тату�а � таким ID."
 
@@ -1444,13 +1716,15 @@ msgid "No such OpenID."
 msgstr "�ет такого OpenID."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "�ет такого документа."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "�ет такой запи�и."
 
@@ -1488,12 +1762,22 @@ msgstr "�ет такой подпи�ки"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "�ет такого пользовател�."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "�ет пользовател� � таким �лектронным адре�ом или именем."
 
@@ -1507,32 +1791,38 @@ msgid "Not a recovery code."
 msgstr "�ет кода во��тановлени�."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "�езареги�трированный пользователь."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "�еподдерживаемый формат данных."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "�еверный код Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "�еверный код OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "�еверный �лектронный адре�"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "�еверный �лектронный адре�."
 
@@ -1540,6 +1830,11 @@ msgstr "�еверный �лектронный адре�."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "�еверное им�."
 
@@ -1559,7 +1854,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "�еверный URL профил� (не YADIS-документ)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "�е �вл�ет�� изображением или разрушенный файл."
 
@@ -1570,11 +1866,13 @@ msgstr "�е авторизовано."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "�еожиданный ответ!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "�е найдено"
 
@@ -1590,11 +1888,15 @@ msgstr "�е найдено"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "�е авторизован."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "�е подпи�ан!"
 
@@ -1611,39 +1913,44 @@ msgid "Notice feed for %s"
 msgstr "Лента запи�ей дл� %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Запи�ь без профил�"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Запи�и"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Запи�и, помеченные %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Старый пароль"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "У�тановки OpenID"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "�втоподдержка OpenID"
 
@@ -1651,29 +1958,34 @@ msgstr "�втоподдержка OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "OpenID вход"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "URL дл� OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "Вход при помощи OpenID отменён."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Вход при помощи OpenID неудачен: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "�еверный OpenID: %s"
@@ -1689,11 +2001,12 @@ msgid "OpenID settings"
 msgstr "У�тановки OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Можно добавить к приглашению личное �ообщение."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Ча�тична� загрузка."
 
@@ -1703,34 +2016,46 @@ msgstr "Ча�тична� загрузка."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Пароль"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Пароль и его подтверждение не �овпадают."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Пароль должен быть длиной не менее 6 �имволов."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Запрошено во��тановление парол�"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Пароль �охранён."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Пароли не �овпадают."
 
@@ -1750,14 +2075,17 @@ msgid "People search"
 msgstr "Пои�к людей"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Личное"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Личное �ообщение"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "�омер телефона, без пробелов, � кодом зоны"
 
@@ -1768,11 +2096,11 @@ msgid ""
 "click \"Cancel\"."
 msgstr ""
 "Пожалуй�та, отметьте �ти подробно�ти, чтобы быть уверенным, что вы хотите "
-"подпи�ать�� на �ти запи�и. Е�ли Вы �того не хотите делать, то нажмите "
-"\"Отказ\"."
+"подпи�ать�� на �ти запи�и. Е�ли Вы �того не хотите делать, то нажмите \"Отказ"
+"\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Публиковать запи�ь, когда мой Jabber/GTalk - �тату� измен�ет��."
 
@@ -1781,7 +2109,9 @@ msgstr "Публиковать запи�ь, когда мой Jabber/GTalk - �
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Предпочтени�"
 
@@ -1790,42 +2120,52 @@ msgstr "Предпочтени�"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Предпочтени� �охранены."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Любимый �зык"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Пользователь�кое �оглашение"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Проблемы � �охранением запи�и."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Профиль"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "URL профил�"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "�а�тройки профил�"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "�еизве�тный профиль"
 
@@ -1834,17 +2174,19 @@ msgid "Public Stream Feed"
 msgstr "Лента публичного потока"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Обща� лента"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Опубликовать MicroID дл� моего Jabber/GTalk - адре�а."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Опубликовать MicroID дл� моего �лектронного адре�а."
 
@@ -1854,12 +2196,14 @@ msgid "Recent Tags"
 msgstr "Свежие теги"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Во��тановление"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Во��тановление парол�"
 
@@ -1872,37 +2216,45 @@ msgstr "Код воÑ�Ñ�тановлениÑ� неизвеÑ�тного пользÐ
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Реги�траци�"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Реги�траци� недопу�тима."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Реги�траци� у�пешна!"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Отбро�ить"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Запомнить мен�"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Удаление профил� как не�оответ�твующего"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Подпи�ать�� на пользовател�"
 
@@ -1916,6 +2268,9 @@ msgstr "Подпи�ать�� на пользовател�"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Убрать"
 
@@ -1924,7 +2279,7 @@ msgstr "Убрать"
 msgid "Remove OpenID"
 msgstr "Убрать OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1933,34 +2288,41 @@ msgstr ""
 "хотите удалить �тот OpenID, то �начала добавьте ещё один."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Ответы"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Ответы дл� %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Переу�тановить"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Переу�тановить пароль"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "СМС"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "�омер телефона дл� СМС"
 
@@ -1969,17 +2331,18 @@ msgstr "�омер телефона дл� СМС"
 msgid "SMS Settings"
 msgstr "У�тановки СМС"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "Подтверждение СМС"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Тот же пароль, что и выше"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Тот же пароль что и �верху. Об�зательно."
 
@@ -1992,12 +2355,21 @@ msgstr "Тот же пароль что и �верху. Об�зательно.
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Сохранить"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Пои�к"
 
@@ -2007,7 +2379,7 @@ msgid "Search Stream Feed"
 msgstr "Лента пои�кового потока"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2016,7 +2388,7 @@ msgstr ""
 "Пои�к по �одержанию запи�ей на %%site.name%%. Между ключевыми �ловами "
 "�тавьте пробелы. Минимальна� длина �лова — 3 буквы."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2026,33 +2398,38 @@ msgstr ""
 "Раздел�йте ключевые �лова пробелами. Минимальна� длина �лова — 3 буквы."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Выбор провайдера"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "ОК"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "По�ылать �лектронные пи�ьма на �тот адре� дл� по�тинга новых запи�ей."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Уведомл�ть мен� о новых подпи�чиках по почте."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "По�ылать мне запи�и через Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2061,16 +2438,19 @@ msgstr ""
 "по пере�ылке."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "По�ылать мне реплики через Jabber/GTalk от людей, на которых � не подпи�ан."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "�а�тройки"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "�а�тройки �охранены."
 
@@ -2090,27 +2470,32 @@ msgid "Something weird happened."
 msgstr "Случило�ь что-то �транное."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Про�тите, вход�щих пи�ем нет."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Про�тите, �то не Ваш вход�щий �лектронный адре�."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "И�ходник"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Стати�тика"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Запи�анный OpenID не найден."
 
@@ -2118,24 +2503,28 @@ msgstr "Запи�анный OpenID не найден."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Подпи�ать��"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Подпи�чики"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Подпи�ка авторизована"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Подпи�ка отменена"
 
@@ -2143,28 +2532,35 @@ msgstr "Подпи�ка отменена"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Подпи�ки"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Си�темна� ошибка при загрузке файла."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Теги"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Тек�т"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Пои�к тек�та"
 
@@ -2184,6 +2580,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Это не Ваш код подтверждени�!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Этот �лектронный адре� уже задей�твован другим пользователем."
 
@@ -2193,63 +2590,73 @@ msgid "That file is too big."
 msgstr "Это �лишком большой файл."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Это уже Ваш Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Это уже Ваш �лектронный адре�."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Это уже ваш номер телефона."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Это не Ваш Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Это не Ваш �лектронный адре�."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Это не Ваш номер телефона."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Это неверный IM-адре�."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Это неверный номер подтверждени�."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Этот телефонный номер уже задей�твован другим пользователем."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Слишком длинна� запи�ь. Мак�имальна� длина - 140 знаков."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Слишком длинна� запи�ь. Мак�имальна� длина - 255 знаков."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "�дре� \"%s\" подтвержден дл� вашего аккаунта."
@@ -2258,11 +2665,14 @@ msgstr "Ð�дреÑ� \"%s\" подтвержден длÑ� вашего аккауÐ
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "�дре� удалён."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2271,7 +2681,8 @@ msgstr ""
 "Подпи�ка авторизована, но нет обратного URL. По�мотрите ин�трукции на �айте "
 "о том, как авторизовать подпи�ку. Ваш подпи�очный купон: "
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2281,35 +2692,40 @@ msgstr ""
 "чтобы полно�тью отказать�� от подпи�ки."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Это пользователи, которые читают запи�и %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Это пользователи, которые читают ваши запи�и."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Это пользователи, запи�и которых читает %s."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Это пользователи, запи�и которых вы читаете."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Это люди, которые уже �вл�ют�� пользовател�ми, и на которых Вы подпи�али�ь "
 "автоматиче�ки:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Код подтверждени� �лишком �тарый. Попробуйте ещё раз."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2318,7 +2734,7 @@ msgstr ""
 "подтверждени� дл� перехода на �айт Вашего OpenID-провайдера. "
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2333,6 +2749,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Этот метод требует POST или DELETE."
 
@@ -2341,25 +2760,37 @@ msgstr "Этот метод требует POST или DELETE."
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Этот метод требует POST."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Страница недо�тупна дл� того типа, который Вы задей�твовали."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Ча�овой по��"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Ча�овой по�� не выбран."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2370,18 +2801,21 @@ msgstr ""
 "[зареги�трировать](%%action.register%%) новый аккаунт."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "�адо пред�тавить два имени пользовател� или кода."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "�дре� твоей �траницы, дневника или профил� на другом портале"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "�дре� URL твоего профил� на другом подход�щем �ерви�е микроблогинга"
 
@@ -2393,15 +2827,22 @@ msgstr "Ð�дреÑ� URL твоего профилÑ� на другом подхоÐ
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "�етиповое подтверждение формы."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "�етипова� переу�тановка парол�."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "�еизве�тное дей�твие"
 
@@ -2432,38 +2873,47 @@ msgstr "Отпи�ать��"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "�еподдерживаема� вер�и� OMB"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "�еподдерживаемый формат файла изображени�."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Обновлени� по СМС"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Обновлено по IM"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Обновлено от %1$s и его друзей на %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Обновлено от %1$s на %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Загрузить"
 
@@ -2484,12 +2934,15 @@ msgid "Upload a new profile image"
 msgstr "Загрузить новое профильное изображение"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "В �той форме ты можешь пригла�ить друзей и коллег на �тот �ерви�."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "�ужна только дл� обновлений, о�ведомлений и во��тановлени� парол�."
 
@@ -2513,11 +2966,16 @@ msgstr "Пользователь от�леживает не�уще�твующ
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "У пользовател� нет профил�."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Им� пользовател�."
 
@@ -2526,29 +2984,33 @@ msgid "User not found."
 msgstr "Пользователь не найден."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "В каком ча�овом по��е Вы обычно находите�ь?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Что нового, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Где вы находите�ь, например «Город, обла�ть, �трана»"
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "�еверный тип изображени� дл� '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "�еверный размер изображени� дл� '%s'"
@@ -2556,7 +3018,9 @@ msgstr "�еверный размер изображени� дл� '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Да"
 
@@ -2579,11 +3043,12 @@ msgid "You are already logged in!"
 msgstr "Вы уже авторизованы!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Вы уже подпи�аны на пользовател�:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "Вы не �вл�ете�ь другом дл� �того пользовател�."
 
@@ -2604,22 +3069,25 @@ msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Вы можете отправл�ть СМС-�ообщени� по �лектронному адре�у от %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
-msgstr "Вы можете удалить OpenID из �воего аккаунта, нажав на кнопку \"Убрать\". "
+msgstr ""
+"Вы можете удалить OpenID из �воего аккаунта, нажав на кнопку \"Убрать\". "
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"Вы можете отправл�ть и получать запи�и через Jabber/GTalk "
-"[онлайн-ме��енджер](%%doc.im%%). �а�тройте ваш аккаунт и предпочтени� ниже."
+"Вы можете отправл�ть и получать запи�и через Jabber/GTalk [онлайн-ме��енджер]"
+"(%%doc.im%%). �а�тройте ваш аккаунт и предпочтени� ниже."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2630,23 +3098,25 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Вы можете и�пользовать локальную подпи�ку!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Вы не можете зареги�трировать��, е�ли Вы не подтверждаете лицензионного "
 "�оглашени�."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Вы не по�ылали нам �тот профиль."
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2668,11 +3138,13 @@ msgstr ""
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Вы не можете удал�ть �тату� других пользователей."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
@@ -2680,6 +3152,7 @@ msgstr ""
 "%s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2687,20 +3160,21 @@ msgstr ""
 "Мы �ообщим Вам, е�ли приглашени� будут прин�ты и вновь приглашенные "
 "зареги�трируют�� на �айте. Спа�ибо за помощь в ро�те нашего �ообще�тва!"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Вы идентифицированны. Введите новый пароль ниже."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "�дре� (URL) Вашего OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Ваше им� на �том �ервере или �лектронный адре� реги�трации."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2710,47 +3184,57 @@ msgstr ""
 "помощи только лишь одного аккаунта.  Управл�йте вашим а��оциированным "
 "аккаунтом OpenIDs от�юда."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "пару �екунд назад"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "около %d дн�(ей) назад"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "около %d ча�а(ов) назад"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "около %d минут(ы) назад"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "около %d ме��ца(ев) назад"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "около дн� назад"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "около минуты назад"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "около ме��ца назад"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "около года назад"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "около ча�а назад"
 
@@ -2772,12 +3256,14 @@ msgid "reply"
 msgstr "ответить"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "повторить пароль �верху"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "неподдерживаемый тип файла"
 
@@ -2798,6 +3284,26 @@ msgstr "Сюда"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Проблема � Вашей �е��ией. Попробуйте ещё раз, пожалуй�та."
 
@@ -2806,6 +3312,7 @@ msgid "This notice is not a favorite!"
 msgstr "Эта запи�ь не входит в чи�ло ваших любимых запи�ей!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "�е удаёт�� удалить любимую запи�ь."
 
@@ -2813,26 +3320,32 @@ msgstr "�е удаёт�� удалить любимую запи�ь."
 msgid "Favor"
 msgstr "Пометить"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "По�ылать мне �ообщение по �лектронной почте, е�ли кто-нибудь добавит мою "
 "запи�ь в чи�ло любимых."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "По�ылать мне �ообщение по �лектронной почте, е�ли кто-нибудь пошлёт мне "
 "приватное �ообщение."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Эта запи�ь уже входит в чи�ло любимых!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "�е удаёт�� �оздать любимую запи�ь."
 
@@ -2842,11 +3355,13 @@ msgstr "�елюбимое"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "Любимые запи�и %s"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Лента любимых запи�ей %s"
@@ -2889,33 +3404,44 @@ msgid "Login with your username and password. "
 msgstr "Вход � вашим ником и паролем."
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Слишком длинно. Мак�имальна� длина �ообщени� - 140 знаков."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "�ет адре�ата."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Вы не можете по�лать �ообщение �тому пользователю."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "�е по�ылайте �ообщени� �ами �ебе; про�то потихоньку �кажите �то �ебе."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "�ет такого пользовател�"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "�овое �ообщение"
 
@@ -2973,6 +3499,11 @@ msgstr "Вы можете обновить зде�ь Вашу личную пр
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Пользователь без �оответ�твующего профил�"
 
@@ -3001,6 +3532,8 @@ msgid "New password successfully saved. "
 msgstr "�овый пароль у�пешно �охранён."
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Пароль должен быть длиной не менее 6 �имволов."
 
@@ -3022,12 +3555,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "Чтобы подпи�ать��, вы должны [авторизовать��](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Лента любимых запи�ей от %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "�е удаёт�� во��тановить любимые запи�и."
 
@@ -3035,7 +3571,7 @@ msgstr "�е удаёт�� во��тановить любимые запи�и
 msgid "No such message."
 msgstr "�ет такого �ообщени�."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Только отправитель и получатель могут читать �то �ообщение."
 
@@ -3059,53 +3595,72 @@ msgid "Mobile carrier for your phone. "
 msgstr "Ваш мобильный оператор."
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Пр�мые �ообщени� дл� %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "В�е пр�мые �ообщени� по�ланные дл� %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Пр�мые �ообщени� по�ланные Вами"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "В�е пр�мые �ообщени� от %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "От�ут�твует тек�т �ообщени�!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Получатель не найден."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "�е удаёт�� по�ылать пр�мые �ообщени� пользовател�м, которые не �вл�ют�� "
 "Вашими друзь�ми."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Любимое от %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s обновлённые любимые запи�и от %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s добавил вашу запи�ь в �о�тав �воих любимых"
@@ -3128,14 +3683,17 @@ msgstr ""
 "на Твиттер,"
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "У�тановки Твиттера"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Твиттер аккаунт"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Текущий проверенный аккаунт на Твиттере."
 
@@ -3144,6 +3702,7 @@ msgid "Twitter Username"
 msgstr "Им� на Твиттере"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Без пробелов, пожалуй�та."
 
@@ -3152,18 +3711,22 @@ msgid "Twitter Password"
 msgstr "Пароль на Твиттере"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "�втоматиче�ки отправл�ть мои запи�и на Твиттер."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Отправл�ть локальные \"@\"-реплики на Твиттер."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Подпи�ать�� на моих Твиттер-друзей зде�ь."
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3172,6 +3735,7 @@ msgstr ""
 "и �имвола подчеркивани� (_). В�его не более 15 �имволов."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "�е удаёт�� подтвердить Ваши данные по Твиттеру!"
 
@@ -3182,33 +3746,43 @@ msgstr "Ð�е удаётÑ�Ñ� подтвердить данные по аккауÐ
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "�е удаёт�� �охранить Ваши у�тановки по Твиттеру!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "У�тановки Твиттера �охранены."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Это не ваш аккаунт на Твиттере."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "�е удаёт�� удалить Твиттер-пользовател�."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Твиттер аккаунт удалён."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "�е удаёт�� �охранить предпочтени� Твиттера."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Предпочтени� Твиттера �охранены."
 
@@ -3225,18 +3799,19 @@ msgid "The subscription has been rejected, but no "
 msgstr "Эта подпи�ка удалена, но не"
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Команда и�полнена"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Команда завершена"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Команда неудачна"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Про�тите, �та команда ещё не выполнена."
 
@@ -3246,89 +3821,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "Подпи�ки: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "У пользовател� нет запи�ей"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Запи�ь помечена как любима�."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Полное им�: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Ме�тора�положение: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашн�� �траница: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "О пользователе: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Сообщение �лишком длинное - не больше 140 �имволов, Вы по�ылаете %d"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Пр�мое �ообщение дл� %s по�лано"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Ошибка при отправке пр�мого �ообщени�."
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Определите им� пользовател� при подпи�ке на"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Подпи�ано на %s"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Определите им� пользовател� дл� отпи�ки от"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Отпи�ано от %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Команда ещё не выполнена."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Оповещение от�ут�твует."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "�ет оповещени�."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Е�ть оповещение."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "Е�ть оповещение."
 
@@ -3336,11 +3933,11 @@ msgstr "Е�ть оповещение."
 msgid "Commands:\n"
 msgstr "Команды:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "�е удаёт�� в�тавить �ообщение."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "�е удаёт�� обновить �ообщение � новым URI."
 
@@ -3357,7 +3954,7 @@ msgstr ""
 "У Ва� новый адре� по�тинга на %1$s.\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "�овое приватное �ообщение от %s"
@@ -3371,7 +3968,7 @@ msgstr ""
 "%1$s (%2$s) по�лал Вам приватное �ообщение:\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "Только �ам пользователь может читать �об�твенный почтовый �щик."
 
@@ -3380,31 +3977,39 @@ msgid "This form should automatically submit itself. "
 msgstr "Это форма дл� автоматиче�кого подтверждени�."
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Любимое"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Любимые запи�и %s"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Пользователь"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Вход�щие"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Ваши вход�щие �ообщени�"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "И�ход�щее"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Ваши и�ход�щие �ообщени�"
 
@@ -3417,14 +4022,19 @@ msgid "Twitter integration options"
 msgstr "Опции интеграции � Твиттером"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "Дл�"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "Сообщение не удаёт�� разобрать."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s и друзь�, �траница %d"
@@ -3434,21 +4044,31 @@ msgid "You can upload your personal avatar."
 msgstr "Тут вы можете загрузить �вой аватар."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "�а�тройки аватара"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Оригинал"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Про�мотр"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Обрезать"
 
@@ -3465,34 +4085,43 @@ msgid "There was a problem with your session token. "
 msgstr "Проблема � Вашей �е��ией. Попробуйте ещё раз, пожалуй�та."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Подберите нужный квадратный ракур� дла вашего аватара"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Потер�на информаци� о файле."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "Потер�н файл."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "�еподдерживаемый тип файла"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "Профиль не определен."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "�ет профил� � таким ID."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Заблокировать пользовател�."
 
@@ -3500,11 +4129,11 @@ msgstr "Заблокировать пользовател�."
 msgid "Are you sure you want to block this user? "
 msgstr "Вы уверены, что хотите заблокировать �того пользовател�?"
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Вы уже заблокировали �того пользовател�."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "�е удаёт�� �охранить информацию о блокировании."
 
@@ -3523,38 +4152,56 @@ msgstr ""
 msgid "Add to favorites"
 msgstr "Добавить в любимые"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Изменить информацию о группе %s"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr "Вход�щие должны быть включены дл� работы групп"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Вы должны авторизовать��, чтобы �оздать новую группу."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "�ет названи� группы"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "�ет такой группы"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Вы должны быть админи�тратором, чтобы измен�ть информацию о группе"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Заполните информацию о группе в �ледующие пол�"
 
@@ -3565,14 +4212,15 @@ msgstr ""
 "пробелов"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "Слишком длинное опи�ание (мак�имум 140 �имволов)"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "�е удаёт�� обновить информацию о группе"
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "�а�тройки �охранены"
 
@@ -3591,7 +4239,8 @@ msgstr ""
 "По�ылать мне �ообщение по �лектронной почте, е�ли кто-нибудь добавит мою "
 "запи�ь в чи�ло любимых."
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Разрешить друзь�м \"подталкивать\" мен� и по�ылать мне �лектронные �ообщени�."
@@ -3606,7 +4255,7 @@ msgstr ""
 "Код подтверждени� вы�лан на ваш �лектронный адре�, который Вы добавили. "
 "Проверьте вход�щие (а так же папку дл� �пама)."
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "Ошибка �ервера - невозможно до�тать пользовател�!"
 
@@ -3622,51 +4271,66 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr "Разрешить %s обновл�ть мой Facebook �тату�"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Пропу�тить"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr "�ет запи�ей!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "Пагинаци�"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "Сюда"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "Туда"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Спа�ибо за приглашени� друзь�м и�пользовать %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "Приглашени� ото�ланы �ледующим адре�атам:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "Ва� пригла�или на %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr "Пригла�ите ваших друзей и�пользовать %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Друзь� уже и�пользующие %s"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "Отправить приглашени�"
@@ -3711,12 +4375,14 @@ msgstr ""
 msgid "Sync preferences"
 msgstr "�а�тройки �инхронизации"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Разлюбить"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Попул�рные запи�и"
 
@@ -3730,7 +4396,8 @@ msgid "The most popular notices on the site right now."
 msgstr "Самые попул�рные запи�и на %%site.name%% на текущий момент."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "О�обые пользователи"
 
@@ -3742,19 +4409,19 @@ msgstr "О�обые пользователи, �траница %d"
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some of the great users on %s"
-msgstr ""
-"Спи�ок наиболее активных, знаменитых и уважаемых пользователей на "
-"%%%%site.name%%%%"
+msgstr "Спи�ок наиболее активных, знаменитых и уважаемых пользователей на %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Этот пользователь заблокировал ва� на его подпи�ку."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "�ет ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Логотип группы"
 
@@ -3762,11 +4429,13 @@ msgstr "Логотип группы"
 msgid "You can upload a logo image for your group."
 msgstr "Тут вы можете загрузить логотип дл� группы."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Логотип обновлён."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "�еудача при обновлении логотипа."
 
@@ -3785,7 +4454,8 @@ msgid "A list of the users in this group."
 msgstr "Спи�ок пользователей, �вл�ющих�� членами �той группы."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Группы"
 
@@ -3800,10 +4470,11 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 "%%%%site.name%%%% группы помогут вам найти и общать�� � людьми по интере�ам. "
 "Подробнее о группах [читайте тут](%%doc.groups%%). Попробуйте [пои�кать "
-"�уще�твующие группы](%%%%action.groupsearch%%%%) или [�оздайте новую "
-"группу](%%%%action.newgroup%%%%)."
+"�уще�твующие группы](%%%%action.groupsearch%%%%) или [�оздайте новую группу]"
+"(%%%%action.newgroup%%%%)."
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "Создать новую группу"
 
@@ -3814,24 +4485,20 @@ msgid ""
 msgstr ""
 "Пои�к группы на %%site.name%% по названию, ме�тора�положению или опи�анию."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Пои�к группы"
 
 #: actions/imsettings.php:70
 msgid "You can send and receive notices through "
 msgstr ""
-"Вы можете отправл�ть и получать запи�и через Jabber/GTalk "
-"[онлайн-ме��енджер](%%doc.im%%). �а�тройте ваш IM аккаунт и предпочтени� "
-"ниже."
+"Вы можете отправл�ть и получать запи�и через Jabber/GTalk [онлайн-ме��енджер]"
+"(%%doc.im%%). �а�тройте ваш IM аккаунт и предпочтени� ниже."
 
 #: actions/imsettings.php:120
 #, php-format
 msgid "Jabber or GTalk address, "
-msgstr ""
-"Jabber или GTalk - адре�, типа \\\"UserName@example.org\\\". Первым делом "
-"убедите�ь, что добавили %s в �пи�ок Ваших корре�пондентов на Вашем "
-"IM-ме��енджере или в GTalk."
+msgstr "Jabber или GTalk - адре�, "
 
 #: actions/imsettings.php:147
 msgid "Send me replies through Jabber/GTalk "
@@ -3840,24 +4507,22 @@ msgstr "По�ылать мне запи�и через Jabber/GTalk."
 #: actions/imsettings.php:321
 #, php-format
 msgid "A confirmation code was sent "
-msgstr ""
-"Код подтверждени� вы�лан на ваш IM-адре�, который вы добавили. Вы должны "
-"подтвердить %s дл� ра��ылки �ообщений вам."
+msgstr "Код подтверждени� вы�лан "
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "Вы должны авторизовать�� дл� в�туплени� в группу."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "Вы уже �вл�ете�ь членом �той группы"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr "�е удаёт�� при�оеденить пользовател� %s к группе %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s в�тупил в группу %s"
@@ -3866,15 +4531,18 @@ msgstr "%s в�тупил в группу %s"
 msgid "Inboxes must be enabled for groups to work."
 msgstr "Вход�щие должны быть включены дл� работы групп."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Вы должны авторизовать��, чтобы покинуть группу."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "�ет такой группы."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "Вы не �вл�ете�ь членом �той группы."
 
@@ -3882,21 +4550,25 @@ msgstr "Вы не �вл�ете�ь членом �той группы."
 msgid "You may not leave a group while you are its administrator."
 msgstr "Вы не можете покинуть группу, пока �вл�ете�ь её админи�тратором."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr "�е удаёт�� найти учетную запи�ь."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "�е удаёт�� удалить пользовател� %s из группы %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s покинул группу %s"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "�вторизовать��"
 
@@ -3908,15 +4580,17 @@ msgstr "�ет текущего �тату�а"
 msgid "New group"
 msgstr "�ова� группа"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "И�пользуйте �ту форму дл� �оздани� новой группы."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "�е удаёт�� �оздать группу."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr "�е удаёт�� назначить член�тво в группе."
 
@@ -3928,11 +4602,14 @@ msgstr "Это �лишком длинно."
 msgid "Don't send a message to yourself; "
 msgstr "Вы не можете по�лать �ообщение �амому �ебе."
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "Запи�ь опубликована"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Ошибка AJAX"
 
@@ -3951,7 +4628,7 @@ msgstr "\"Подталкивание\" по�лано"
 msgid "Nudge sent!"
 msgstr "\"Подталкивание\" отправлено!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr "OpenID вход"
 
@@ -3975,11 +4652,13 @@ msgstr "�втоматиче�кое укорочение длинных URL"
 msgid "Service"
 msgstr "Серви�"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "�втоматиче�ки и�пользовать выбранный �ерви�"
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Серви� �окращени� URL �лишком длинный (мак�имум 50 �имволов)."
 
@@ -3987,16 +4666,17 @@ msgstr "СервиÑ� Ñ�окращениÑ� URL Ñ�лишком длинный (мÐ
 msgid "Change your password."
 msgstr "Изменить ваш пароль"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr "Пароль �охранён."
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr "�еверный тег человека: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Пользователь�кие авто-теги от %s - �траница %d"
@@ -4006,11 +4686,12 @@ msgstr "ПользовательÑ�кие авто-теги от %s - Ñ�транÐ
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Е�ть пользователи, которые пометили �еб� как \"%s\""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Информаци� профил�"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4022,20 +4703,25 @@ msgid "Automatically subscribe to whoever "
 msgstr "�втоматиче�ки подпи�ывать�� на в�ех, кто подпи�ал�� на мен�"
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "�еверный тег: \"%s\""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "�е удаёт�� �охранить теги."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Обща� лента, �траница %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "�е удаёт�� вернуть публичный поток."
 
@@ -4045,8 +4731,8 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"Это �айт %%site.name%%, дл� [микроблогинга](http://en.wikipedia.org/wiki/"
-"Micro-blogging)"
+"%%site.name%% - �то �айт дл� [микроблогинга](http://ru.wikipedia.org/wiki/"
+"Микроблоггинг)"
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4057,11 +4743,13 @@ msgstr "Общее облако т�гов"
 msgid "These are most popular recent tags on %s "
 msgstr "Самые попул�рные т�ги на %s на текущий момент"
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "Облако т�гов"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "Про�тите, реги�траци� только по приглашению."
 
@@ -4073,10 +4761,7 @@ msgstr ""
 
 #: actions/register.php:286
 msgid "With this form you can create "
-msgstr ""
-"При помощи �той формы вы можете �оздать новый %%site.name%% аккаунт. (Е�ть "
-"[OpenID](http://openid.net/) аккаунт? Тогда и�пользуй [OpenID "
-"реги�трацию](%%action.openidlogin%%)!)"
+msgstr "При помощи �той формы вы можете �оздать "
 
 #: actions/register.php:368
 msgid "1-64 lowercase letters or numbers, "
@@ -4110,21 +4795,7 @@ msgstr ""
 #: actions/register.php:471
 #, php-format
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr ""
-"�аши поздравлени�, %s! И добро пожаловать на %%%%site.name%%%%. Зде�ь вы "
-"можете ...\n"
-"\n"
-"* Перейти на [ваш микроблог](%s) и запо�тить вашу первую запи�ь.\n"
-"* Добавить ваш [Jabber/GTalk - аккаунт](%%%%action.imsettings%%%%) так что "
-"вы �можете по�ле �того отправл�ть запи�и через ме��енджеры.\n"
-"* [И�кать людей](%%%%action.peoplesearch%%%%), которых вы возможно знаете "
-"или � которыми раздел�ете одни и те же интере�ы.\n"
-"* Обновить ваши [профильные на�тройки](%%%%action.profilesettings%%%%) чтобы "
-"больше ра��казать другим о �ебе.\n"
-"* Прочитать [документацию](%%%%doc.help%%%%) чтобы поподробнее узнать об "
-"о�обенно�т�х данного в�б �ерви�а и о том как его и�пользовать.\n"
-"Спа�ибо за то, что при�оединили�ь к нам и надеем��, что вы получите "
-"удоволь�твие от и�пользовани� данного �ерви�а!"
+msgstr "�аши поздравлени�, %s! И добро пожаловать на %%%%site.name%%%%. "
 
 #: actions/register.php:495
 msgid "(You should receive a message by email "
@@ -4136,7 +4807,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr "Это локальный профиль! �вторизуйте�ь дл� подпи�ки."
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Ответы дл� %s, �траница %d"
@@ -4146,50 +4818,71 @@ msgstr "Ответы дл� %s, �траница %d"
 msgid "%s favorite notices, page %d"
 msgstr "Любимые запи�и %s, �траница %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Группа %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Группа %s, �траница %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Профиль группы"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr "Запи�ь"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Дей�тви� группы"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr "Лента запи�ей от группы %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Уча�тники"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(пока ничего нет)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "В�е уча�тники"
 
@@ -4199,14 +4892,14 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"Это �айт %%site.name%%, дл� [микроблогинга](http://en.wikipedia.org/wiki/"
-"Micro-blogging)"
+"**%s** - �то группа пользователей на �айте %%%%site.name%%%%, дл� "
+"[микроблогинга](http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
 msgstr "Только отправитель и получатель могут читать �то �ообщение."
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "Вход�щие дл� %s - �траница %d"
@@ -4216,30 +4909,37 @@ msgid "'s profile"
 msgstr "Профиль"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "Профиль пользовател�"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Фото"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "Дей�тви� пользовател�"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "По�лать приватное �ообщение �тому пользователю."
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Сообщение"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "В�е подпи�чики"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "В�е группы"
 
@@ -4249,11 +4949,8 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** имеет аккаунт на %%%%site.name%%%%, �ерви�е дл� "
-"[микроблогинга](http://en.wikipedia.org/wiki/Micro-blogging). "
-"[При�оеден�й��](%%%%action.register%%%%) и получи возможно�ть быть в�егда в "
-"кур�е в�его �амого интере�ного в жизни **%s**. ([Читать "
-"больше](%%%%doc.help%%%%))"
+"**%s** зареги�трирован на %%%%site.name%%%%, �ерви�е дл� [микроблогинга]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) "
 
 #: actions/smssettings.php:128
 msgid "Phone number, no punctuation or spaces, "
@@ -4269,7 +4966,7 @@ msgstr ""
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "В ожидании подтверждени� данного номера телефона."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Выбор провайдера"
 
@@ -4306,7 +5003,7 @@ msgstr "Это пользователи, которые читают запиÑ�Ð
 #: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who "
-msgstr "Это пользователи, которые читают запи�и %s."
+msgstr "Это пользователи, которые "
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4325,18 +5022,19 @@ msgstr "Это пользователи, запиÑ�и которых читаеÑ
 #: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose "
-msgstr "Это пользователи, которые читают запи�и %s."
+msgstr "Это пользователи, которые "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Запи�и, помеченные %s, �траница %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "Запи�и, помеченные \"%s\", в хронологиче�ком пор�дке"
@@ -4358,7 +5056,7 @@ msgstr "Т�ги %s"
 msgid "Tag user"
 msgstr "Т�ги дл� пользовател�"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4370,18 +5068,18 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "Проблема � Вашей �е��ией. Попробуйте ещё раз, пожалуй�та."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Вы можете помечать тегами только пользователей, на которых подпи�аны или "
 "которые подпи�аны на Ва�."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "�е удаёт�� �охранить теги."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "И�пользуйте �ту форму дл� добавлени� тегов Вашим подпи�чикам или подпи�антам."
@@ -4390,20 +5088,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "�ет такого тега."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "Микроблог помеченный дл� %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "�еудача при блокировке пользовател�."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "�еудача при разблокировке пользовател�."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "�е найдено."
 
@@ -4413,15 +5114,16 @@ msgstr ""
 "Добавьте ваш аккаунт на Твиттере дл� автоматиче�кой отправки ваших запи�ей "
 "на Твиттер, и подпишите�ь на друзей � Твиттера, которые уже зде�ь."
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Им� Твиттер-пользовател�"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Твиттер-пароль"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Твиттер-друзь�"
 
@@ -4434,147 +5136,156 @@ msgstr ""
 #: actions/twittersettings.php:341
 #, php-format
 msgid "Unable to retrieve account information "
-msgstr "�е удаёт�� подтвердить данные по аккаунту от \"%s\" из Твитера."
+msgstr "�е удаёт�� подтвердить данные по аккаунту "
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "Ошибка при удалении данного блока."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "�ет ID профил� в запро�е."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "�ет профил� � таким ID."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Отпи�ано"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "Группы %s"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Группы %s, �траница %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблема при �охранении запи�и. �еизве�тный пользователь."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Слишком много запи�ей за �толь короткий �рок; передохните немного и "
 "попробуйте вновь через пару минут."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Вам запрещено по�тить�� на �том �айте (бан)"
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Загрузить аватар"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Другое"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Другие опции"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Страница без названи�"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Главна� навигаци�"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Личный профиль и лента друзей"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "И�кать людей или тек�т"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "�а�тройки"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Изменить ваш email, аватар, пароль, профиль и др."
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Соединить�� � IM, SMS, Twitter"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Выйти"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Войти"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Создать новый аккаунт"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "Войти � OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "Помощь"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr "�ова� запи�ь"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "Локальные виды"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr "�ова� запи�ь"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "�авигаци� по подпи�кам"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "StatusNet лицензи�"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "В�е"
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "лицензи�."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "Заблокировать пользовател�."
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Блокировать"
 
@@ -4587,11 +5298,14 @@ msgstr "Мне не нравить�� �та запи�ь"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "Вы должны авторизовать�� чтобы и�пользовать %s приложение"
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr "Создать новую учетную запи�ь"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "Общее"
 
@@ -4611,31 +5325,36 @@ msgstr "Фильтровать т�ги"
 msgid "All"
 msgstr "В�е"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Т�ги"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Выберите т�г из выпадающего �пи�ка"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Перейти"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "�дре� �траницы, дневника или профил� группы на другом портале"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Опи�ание"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Опиши группу при помощи 140 �имволов"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Где находит�� группа, например «Город, обла�ть, �трана»"
@@ -4644,20 +5363,20 @@ msgstr "Где находитÑ�Ñ� группа, например «Город, Ð
 msgid "Group"
 msgstr "Группа"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "�а�тройки"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Редактировать информацию о группе %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Логотип"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Добавить или изменить логотип группы %s"
@@ -4687,11 +5406,11 @@ msgstr "�вторизаци�"
 msgid "Leave"
 msgstr "Выйти"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Войти � вашим ником и паролем."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Создать новый аккаунт"
 
@@ -4711,19 +5430,19 @@ msgstr ""
 #: lib/mail.php:236
 #, php-format
 msgid "%1$s is now listening to "
-msgstr "%1$s теперь про�матривает твои запи�и на %2$s."
+msgstr "%1$s теперь про�матривает твои запи�и "
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Ме�тора�положение: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Домашн�� �траница: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4732,7 +5451,7 @@ msgstr ""
 "Био: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Ва� \"подтолкнул\" пользователь %s"
@@ -4749,39 +5468,47 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s добавил вашу запи�ь от %2$s в �о�тав �воих любимых."
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr " из"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "По�лать пр�мую запи�ь"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "По�лать запи�ь"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "6 или больше знаков"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "в ответ на"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Ответить на �ту запи�ь"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Ответить"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Удалить �ту запи�ь"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Удалить"
 
@@ -4802,27 +5529,29 @@ msgstr "\"Подтолкнуть\" �того пользовател�"
 msgid "Tags in %s's notices"
 msgstr "Т�ги запи�ей пользовател� %s"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(пока ничего нет)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Общее"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Группы"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Облаго т�гов"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "О�обые"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Попул�рное"
 
@@ -4838,31 +5567,33 @@ msgstr "�айти группы на �том �айте"
 msgid "Untitled section"
 msgstr "Секци� без названи�"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Люди на которых подпи�ан %s"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Люди подпи�анные на %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Группы, в которых �о�тоит %s"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
-msgstr "В �той форме ты можешь пригла�ить друзей и коллег на �тот �ерви�."
+msgstr "Пригла�и друзей и коллег �тать такими же как ты уча�тниками %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Пользователь заблокировал Ва�."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Подпи�ать�� на %s"
 
@@ -4875,10 +5606,11 @@ msgid "Top posters"
 msgstr "Самые активные"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Разблокировать пользовател�."
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Разблокировать"
 
@@ -4886,38 +5618,2091 @@ msgstr "Разблокировать"
 msgid "Unsubscribe from this user"
 msgstr "Отпи�ать�� от �того пользовател�"
 
-#~ msgid "Code not yet ready."
-#~ msgstr "Код ещё не готов."
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Лента друзей %s (RSS 1.0)"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Лента друзей %s (RSS 2.0)"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Лента друзей %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s и друзь�"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Тут вы можете загрузить �вой аватар."
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "�ватар обновлён."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 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:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Проблема � Вашей �е��ией. Попробуйте ещё раз, пожалуй�та."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+"По�ылать мне �ообщение по �лектронной почте, е�ли кто-нибудь пошлёт мне "
+"приватное �ообщение."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Тут вы можете загрузить логотип дл� группы."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Подберите нужный квадратный ракур� дла вашего аватара"
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Микроблог от %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Пои�к людей на %%site.name%% по имени, ме�тора�положению или интере�ам. "
+"Раздел�йте ключевые �лова пробелами. Минимальна� длина �лова — 3 буквы."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Ошибка при отправке пр�мого �ообщени�."
+
+#: actions/noticesearch.php:91
+#, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr ""
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"По причинам �охранени� безопа�но�ти введите им� и пароль ещё раз, прежде чем "
+"измен�ть Ваши у�тановки."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Лента публичного потока"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Лента публичного потока"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Лента публичного потока"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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%% - �то �айт дл� [микроблогинга](http://ru.wikipedia.org/wiki/"
+"Микроблоггинг), �озданный � и�пользованием �вободного программного "
+"обе�печени� [StatusNet](http://status.net/). [Стань уча�тником](%%action."
+"register%%), чтобы держать в кур�е �воих  �обытий  поклонников, друзей, "
+"род�твенников и коллег! ([Читать далее](%%doc.help%%))"
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+"При помощи �той формы вы можете �оздать новый аккаунт, чтобы публиковать "
+"короткие �ообщени� и у�танавливать �в�зи � друзь�ми и коллегами (Е�ть "
+"[OpenID](http://openid.net/) аккаунт? Тогда и�пользуй [OpenID реги�трацию](%%"
+"action.openidlogin%%)!)"
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+", за и�ключением моей приватной информации: парол�, почты, ме��енджера, "
+"телефона."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Создать"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+"**%s** - �то группа на �айте %%%%site.name%%%%, предо�тавл�ющем �ерви� "
+"[микроблогинга](http://ru.wikipedia.org/wiki/Микроблоггинг), �озданный � "
+"и�пользованием �вободного программного обе�печени� [StatusNet](http://status."
+"net/). Уча�тники обменивают�� короткими �ообщени�ми о �воих ново�т�х. "
+"[Зареги�трируй��](%%%%action.register%%%%), чтобы �тать уча�тником группы и "
+"получить множе�тво других возможно�тей! ([Читать далее](%%%%doc.help%%%%))"
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Профиль группы"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "Профиль"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Лента запи�ей дл� %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Лента запи�ей дл� %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Лента запи�ей дл� %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "И�ход�щие дл� %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "�ватар"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "�а�тройки профил�"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+"**%s** �вл�ет�� зареги�трированным уча�тником %%%%site.name%%%% - �айта дл� "
+"[микроблогинга](http://ru.wikipedia.org/wiki/Микроблоггинг), �озданного � "
+"и�пользованием �вободного программного обе�печени� [StatusNet](http://status."
+"net/). [Зареги�трируй��](%%%%action.register%%%%), чтобы в�егда получать "
+"�ообщени�  уча�тника **%s** и иметь до�туп ко множе�тву других возможно�тей! "
+"([Читать далее](%%%%doc.help%%%%))"
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Код подтверждени� вы�лан на мобильный номер, который вы добавили.  "
+"По�мотрите Ваши вход�щие �ообщени� (и папку дл� �пама тоже!) дл� нахождени� "
+"�того кода и ин�трукций по его и�пользованию."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "�ет такого пользовател�"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Добавьте ваш аккаунт на Твиттере дл� автоматиче�кой отправки ваших запи�ей "
+"на Твиттер,"
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "�е удаёт�� подтвердить данные по аккаунту \"%s\" из Твитера."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "И�кать людей или тек�т"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Слишком много запи�ей за �толь короткий �рок; передохните немного и "
+"попробуйте вновь через пару минут."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Соединить�� � IM, SMS, Twitter"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "\"Подтолкнуть\""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr "Ошибка базы данных"
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "Вы должны авторизовать�� чтобы и�пользовать %s приложение"
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, 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 ""
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Пои�к"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "�ет такого документа."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Спи�ок пользователей, �вл�ющих�� членами �той группы."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Спи�ок пользователей, �вл�ющих�� членами �той группы."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Профиль пользовател�"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s и друзь�, �траница %d"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Спи�ок пользователей, �вл�ющих�� членами �той группы."
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "�еудача при разблокировке пользовател�."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Код подтверждени�"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "�е удаёт�� удалить �ту запи�ь."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "�еверный тег: \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Такое им� уже и�пользует��. Попробуйте какое-нибудь другое."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "�е удаёт�� �оздать любимую запи�ь."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "�ова� запи�ь"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "�ова� запи�ь"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "�еверное им�."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Профиль не определен."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Пользователь заблокировал Ва�."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Вы не �вл�ете�ь членом �той группы."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Заблокировать пользовател�."
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Вы должны авторизовать��, чтобы �оздать новую группу."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Группы"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "�е удаёт�� обновить пользовател�."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "�е удаёт�� �охранить Ваши у�тановки по Твиттеру!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "�а�тройки �инхронизации �охранены."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Вы должны быть админи�тратором, чтобы измен�ть информацию о группе"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "�а�тройки"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "�ет результатов."
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Пользователь заблокировал Ва�."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Сообщение"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "�е удаёт�� �охранить профиль."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) позвол�ет вам авторизовать�� на многих �айтах при "
+"помощи только лишь одного аккаунта.  Управл�йте вашим а��оциированным "
+"аккаунтом OpenIDs от�юда."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "�а�тройки профил�"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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://ru.wikipedia.org/wiki/"
+"Микроблоггинг), �озданный � и�пользованием �вободного программного "
+"обе�печени� [StatusNet](http://status.net/)."
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've 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
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Вы идентифицированны. Введите новый пароль ниже."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Запрошено во��тановление парол�"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Ошибка, �в�занна� � кодом подтверждени�."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Подпи�ать�� на %s"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Любимые запи�и %s, �траница %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Лента запи�ей от группы %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Лента запи�ей от группы %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Лента запи�ей от группы %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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://ru.wikipedia.org/wiki/Микроблоггинг) , �озданный � "
+"и�пользованием �вободного программного обе�печени� [StatusNet](http://status."
+"net/). Уча�тники обменивают�� короткими �ообщени�ми о �воих ново�т�х. "
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "�а�тройки"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "�е локальный пользователь."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Запи�и, помеченные %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Лента запи�ей от группы %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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://ru.wikipedia.org/wiki/Микроблоггинг), �озданного � "
+"и�пользованием �вободного программного обе�печени� [StatusNet](http://status."
+"net/)."
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s теперь про�матривает твои запи�и на %2$s."
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Лента запи�ей дл� %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Лента запи�ей дл� %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Эта запи�ь уже входит в чи�ло любимых!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Эта запи�ь не входит в чи�ло ваших любимых запи�ей!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "�е удаёт�� вернуть публичный поток."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "�ет адре�ата."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "�ет �тату�ов."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr ""
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Обновлено от %1$s на %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "лицензи�."
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Подпи�ки %s"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "�а�тройки профил�"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Вы не �вл�ете�ь членом �той группы."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Проблемы � �охранением запи�и."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Сообщение дл� %1$s на %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Профиль пользовател�"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Профиль"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Загрузить"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Изменить Ваш пароль"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Соединить"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Пои�к"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Спи�ок"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Блокировать"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Заблокировать пользовател�."
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Добавить или изменить логотип группы %s"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "�ет контента!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Пользователь"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Пои�к"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "URL Главной �траницы неверен."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "�ет такого тега."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Пр�мые �ообщени� дл� %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Слишком длинно. Мак�имальна� длина �ообщени� - 140 знаков."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr ""
+"�е удаёт�� �ледовать за пользователем, т. к. такого пользовател� не "
+"�уще�твует."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Слишком длинное опи�ание (мак�имум 140 �имволов)"
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Вы уже �вл�ете�ь членом �той группы"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "�е удаёт�� при�оеденить пользовател� %s к группе %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Вы не �вл�ете�ь членом �той группы."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "�е удаёт�� удалить пользовател� %s из группы %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Группы %s"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Группы, в которых �о�тоит %s"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Дей�тви� группы"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "�ватар обновлён."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Слишком длинна� запи�ь. Мак�имальна� длина - 140 знаков."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "�еподдерживаемый формат файла изображени�."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Фото"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Слишком длинное опи�ание (мак�имум 140 �имволов)"
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Обновлено от %1$s на %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Пользователь от�леживает не�уще�твующее."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "�е авторизовано."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "�е удаёт�� преобразовать запро�ы в до�тупы."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "�еизве�тна� вер�и� OMB-протокола."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "�ет такой запи�и."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Потер�н файл."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Обновлено от %1$s на %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Страница недо�тупна дл� того типа, который Вы задей�твовали."
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Вход � вашим ником и паролем. �ет аккаунта? [Зареги�трируйте](%%action."
+"register%%) новый аккаунт, или попробуйте авторизовать�� при помощи [OpenID]"
+"(%%action.openidlogin%%). "
 
-#~ msgid "Export and delete your user information."
-#~ msgstr "Эк�порт и удаление Вашей пользователь�кой информации."
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Обновлено от %1$s на %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "В�е обновлени�, �оответ�твующие пои�ковому запро�у «%s»"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Соединить"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Опиши �еб� и �вои увлечени� при помощи 140 �имволов"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Опиши �еб� и �вои интере�ы при помощи 140 �имволов."
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Слишком длинное био (мак�имум 140 �имволов)."
+
+#: actions/register.php:336
+#, fuzzy
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+"При помощи �той формы вы можете �оздать новый аккаунт, чтобы публиковать "
+"короткие �ообщени� и у�танавливать �в�зи � друзь�ми и коллегами (Е�ть "
+"[OpenID](http://openid.net/) аккаунт? Тогда и�пользуй [OpenID реги�трацию](%%"
+"action.openidlogin%%)!)"
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "�еверный URL профил� (не YADIS-документ)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Это локальный профиль! �вторизуйте�ь дл� подпи�ки."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "�е удаёт�� получить запро�."
 
-#~ msgid "Delete my account"
-#~ msgstr "Удалить мой �чёт"
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Лента запи�ей дл� %s"
 
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Подтверждение удалени� моего �чёта"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Лента запи�ей дл� %s"
 
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Пометьте, е�ли уверены, что хотите удалить ваш �чёт."
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Лента запи�ей дл� %s"
 
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Показ по�ледних попул�рных заметок"
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Сообщение дл� %1$s на %2$s"
 
-#~ msgid "Tag a person"
-#~ msgstr "Тег пользовател�"
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Лента друзей %s (RSS 1.0)"
 
-#~ msgid "List"
-#~ msgstr "Спи�ок"
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Лента друзей %s (RSS 2.0)"
 
-#~ msgid "Icons"
-#~ msgstr "Иконки"
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Лента друзей %s"
 
-#~ msgid ""
-#~ "Hey, %s.\n"
-#~ "\n"
-#~ "Someone just entered this email address on %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Привет, %s.\n"
-#~ "Кто-то добавил �тот �лектронный адре� дл� %s."
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "И�ход�щие дл� %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Запи�ь опубликована"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Страница недо�тупна дл� того типа, который Вы задей�твовали."
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Лента запи�ей дл� %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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:249
+#, 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:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Подпи�ка отвергнута, но нет обратного URL. Проверьте ин�трукции на �айте, "
+"чтобы полно�тью отказать�� от подпи�ки."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "�е удаёт�� прочитать URL аватары «%s»"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "�еверный тип изображени� дл� '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "�е удаёт�� перенаправить на �ервер: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet лицензи�"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "�е удаёт�� одновить пользовател� � подтверждённым �лектронным адре�ом."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "\"Подталкивание\" по�лано"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Сообщение �лишком длинное - не больше 140 �имволов, Вы по�ылаете %d"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Сообщение �лишком длинное - не больше 140 �имволов, Вы по�ылаете %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Ответить на �ту запи�ь"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Проблемы � �охранением запи�и."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "�ет кода подтверждени�."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Войти"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Выбор провайдера"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Опиши группу при помощи 140 �имволов"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Опиши группу при помощи 140 �имволов"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "�ова� запи�ь"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s добавил вашу запи�ь в �о�тав �воих любимых"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "от "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "�е удаёт�� вернуть публичный поток."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Удалить запи�ь"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index c7ac6ac9b..f79727fe8 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-14 10:32-0700\n"
+"POT-Creation-Date: 2009-11-06 13:16+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"
@@ -41,12 +41,13 @@ msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#: actions/invite.php:218 actions/invite.php:220
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
 #: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -96,20 +97,21 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
 #: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
-#: actions/twitapistatuses.php:328
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161 actions/shownotice.php:174
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#: actions/invite.php:125 actions/invite.php:133
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -129,14 +131,16 @@ msgstr ""
 #: actions/facebookhome.php:163 actions/twitapistatuses.php:130
 #: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
 #: actions/facebookhome.php:158 actions/twitapistatuses.php:89
-#: lib/personalgroupnav.php:100
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
 #: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
-#: actions/twitapistatuses.php:37
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
@@ -149,26 +153,29 @@ msgstr ""
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
 #: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
 #: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
-#: actions/twitapistatuses.php:41
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
 #: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
-#: lib/action.php:752
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -176,7 +183,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
-#: lib/action.php:754
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
@@ -189,32 +196,33 @@ msgstr ""
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
 #: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
-#: lib/groupeditform.php:154
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
-#: actions/register.php:368 actions/register.php:414
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr ""
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 #: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373 actions/register.php:419
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr ""
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
-#: actions/imsettings.php:321
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -222,7 +230,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-#: actions/emailsettings.php:350
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -265,7 +273,21 @@ msgstr ""
 #: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
 #: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
 #: actions/twitapistatuses.php:409 actions/twitapitags.php:110
-#: actions/twitapiusers.php:34
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
@@ -298,12 +320,13 @@ msgid "API method under construction."
 msgstr ""
 
 #: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
-#: lib/action.php:706
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr ""
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 #: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr ""
 
@@ -315,6 +338,8 @@ msgstr ""
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
 #: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr ""
 
@@ -332,12 +357,13 @@ msgstr ""
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr ""
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-#: actions/invite.php:181 actions/invite.php:183
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
@@ -364,6 +390,7 @@ msgstr ""
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
 #: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr ""
 
@@ -373,22 +400,26 @@ msgstr ""
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 #: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 #: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr ""
 
 #: ../actions/login.php:104 ../actions/register.php:178
 #: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
-#: actions/register.php:416 actions/register.php:463
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 #: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -397,7 +428,8 @@ msgstr ""
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
 #: actions/avatarsettings.php:67 actions/showgroup.php:211
-#: actions/showgroup.php:216
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr ""
 
@@ -407,7 +439,7 @@ msgid "Avatar updated."
 msgstr ""
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
-#: actions/imsettings.php:108
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -415,14 +447,14 @@ msgid ""
 msgstr ""
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-#: actions/emailsettings.php:107
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
@@ -433,7 +465,8 @@ msgstr ""
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
-#: actions/register.php:448
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr ""
 
@@ -447,6 +480,7 @@ msgid "Bio is too long (max 140 chars)."
 msgstr ""
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr ""
 
@@ -460,6 +494,7 @@ msgstr ""
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr ""
 
@@ -467,7 +502,8 @@ msgstr ""
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr ""
 
@@ -477,22 +513,23 @@ msgid "Cannot instantiate OpenID consumer object."
 msgstr ""
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 #: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr ""
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr ""
 
@@ -502,11 +539,12 @@ msgid "Change password"
 msgstr ""
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr ""
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr ""
 
@@ -517,6 +555,8 @@ msgstr ""
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
 #: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr ""
 
@@ -530,11 +570,13 @@ msgstr ""
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
 #: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr ""
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr ""
 
@@ -544,7 +586,7 @@ msgid "Confirmation code not found."
 msgstr ""
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -566,7 +608,7 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
 #: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
-#: lib/action.php:425
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr ""
 
@@ -576,7 +618,7 @@ msgid "Connect existing account"
 msgstr ""
 
 #: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
-#: lib/action.php:719
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr ""
 
@@ -590,12 +632,14 @@ msgstr ""
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
 #: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
 #: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr ""
 
@@ -639,7 +683,8 @@ msgstr ""
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
-#: actions/emailsettings.php:382
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
@@ -662,23 +707,26 @@ msgstr ""
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
 #: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr ""
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-#: actions/twitapiaccount.php:82
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr ""
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
@@ -688,6 +736,8 @@ msgstr ""
 #: actions/emailsettings.php:447 actions/emailsettings.php:469
 #: actions/smssettings.php:515 actions/smssettings.php:539
 #: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -705,7 +755,11 @@ msgstr ""
 #: actions/profilesettings.php:259 actions/smssettings.php:266
 #: actions/smssettings.php:408 actions/emailsettings.php:287
 #: actions/emailsettings.php:418 actions/othersettings.php:167
-#: actions/profilesettings.php:260
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr ""
 
@@ -730,17 +784,17 @@ msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -749,19 +803,20 @@ msgid "Currently"
 msgstr ""
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#: classes/Notice.php:114 classes/Notice.php:124
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#: classes/Notice.php:757 classes/Notice.php:1042
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 #: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr ""
 
@@ -776,12 +831,13 @@ msgstr ""
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
-#: actions/register.php:427 actions/register.php:431
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr ""
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr ""
 
@@ -791,7 +847,7 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr ""
 
@@ -800,22 +856,23 @@ msgid "Email address confirmation"
 msgstr ""
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-#: actions/invite.php:179 actions/invite.php:181
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr ""
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 #: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr ""
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr ""
 
@@ -837,21 +894,25 @@ msgstr ""
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr ""
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 #: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr ""
 
@@ -872,6 +933,7 @@ msgstr ""
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr ""
 
@@ -881,7 +943,8 @@ msgstr ""
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
 #: actions/login.php:120 actions/recoverpassword.php:372
-#: actions/register.php:235
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr ""
 
@@ -892,6 +955,7 @@ msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr ""
 
@@ -906,7 +970,7 @@ msgid "Existing nickname"
 msgstr ""
 
 #: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
-#: lib/action.php:708
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr ""
 
@@ -945,7 +1009,7 @@ msgstr ""
 msgid "Find people on this site"
 msgstr ""
 
-#: ../actions/login.php:122 actions/login.php:247
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -959,6 +1023,8 @@ msgstr ""
 #: actions/showgroup.php:237 actions/showstream.php:255
 #: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
 #: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr ""
 
@@ -970,17 +1036,21 @@ msgstr ""
 #: actions/updateprofile.php:97 actions/updateprofile.php:99
 #: actions/editgroup.php:197 actions/newgroup.php:147
 #: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr ""
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 #: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr ""
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
 #: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr ""
 
@@ -988,7 +1058,8 @@ msgstr ""
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
 #: lib/groupeditform.php:146 actions/register.php:442
-#: lib/groupeditform.php:161
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr ""
 
@@ -998,21 +1069,25 @@ msgstr ""
 #: actions/profilesettings.php:199 actions/register.php:168
 #: actions/editgroup.php:194 actions/newgroup.php:144
 #: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr ""
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 #: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr ""
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr ""
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr ""
 
@@ -1043,28 +1118,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
 #: actions/emailsettings.php:443 actions/emailsettings.php:450
 #: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
 #: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr ""
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
 #: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
-#: actions/facebookhome.php:129
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr ""
 
 #: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
-#: actions/recoverpassword.php:322
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1095,7 +1173,7 @@ msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr ""
 
@@ -1116,7 +1194,7 @@ msgid "Invalid profile URL '%s'."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
@@ -1136,33 +1214,33 @@ msgstr ""
 #: actions/finishopenidlogin.php:279 actions/register.php:193
 #: actions/register.php:211 actions/finishopenidlogin.php:284
 #: actions/finishopenidlogin.php:307 actions/register.php:230
-#: actions/register.php:251
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr ""
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-#: actions/invite.php:104
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-#: actions/invite.php:138
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
 #: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
-#: lib/facebookaction.php:221 lib/subgroupnav.php:105
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr ""
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-#: actions/invite.php:106
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr ""
 
 #: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
-#: lib/action.php:756
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1171,12 +1249,12 @@ msgid ""
 msgstr ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
-#: actions/imsettings.php:120
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1185,11 +1263,13 @@ msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr ""
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 #: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
@@ -1203,6 +1283,10 @@ msgstr ""
 #: actions/register.php:454 actions/showgroup.php:251
 #: actions/showstream.php:229 actions/userauthorization.php:128
 #: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr ""
 
@@ -1214,6 +1298,9 @@ msgstr ""
 #: actions/updateprofile.php:112 actions/updateprofile.php:114
 #: actions/editgroup.php:203 actions/newgroup.php:153
 #: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
@@ -1225,7 +1312,8 @@ msgstr ""
 #: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
 #: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
 #: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
-#: lib/facebookaction.php:295 lib/facebookaction.php:321
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr ""
@@ -1245,24 +1333,25 @@ msgid ""
 msgstr ""
 
 #: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
-#: lib/action.php:435
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr ""
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393 actions/register.php:439
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
 #: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr ""
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
 #: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -1284,6 +1373,7 @@ msgid "Microblog by %s"
 msgstr ""
 
 #: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1294,13 +1384,14 @@ msgstr ""
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
 #: actions/register.php:430 actions/finishopenidlogin.php:106
-#: actions/register.php:477
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr ""
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr ""
 
@@ -1312,6 +1403,7 @@ msgstr ""
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 #: actions/emailsettings.php:465 actions/emailsettings.php:472
 #: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1321,19 +1413,20 @@ msgid "New nickname"
 msgstr ""
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr ""
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-#: actions/recoverpassword.php:232
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr ""
 
 #: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
-#: actions/recoverpassword.php:379
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
@@ -1347,7 +1440,9 @@ msgstr ""
 #: actions/showgroup.php:226 actions/showstream.php:244
 #: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
 #: actions/showgroup.php:231 actions/showstream.php:209
-#: lib/facebookaction.php:314 lib/groupeditform.php:152
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr ""
 
@@ -1359,6 +1454,9 @@ msgstr ""
 #: actions/register.php:159 actions/editgroup.php:185
 #: actions/finishopenidlogin.php:231 actions/newgroup.php:135
 #: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
@@ -1372,6 +1470,9 @@ msgstr ""
 #: actions/updateprofile.php:83 actions/editgroup.php:181
 #: actions/finishopenidlogin.php:221 actions/newgroup.php:131
 #: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
@@ -1381,7 +1482,7 @@ msgid "Nickname not allowed."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
@@ -1394,26 +1495,28 @@ msgstr ""
 #: actions/block.php:147 actions/deletenotice.php:118
 #: actions/deletenotice.php:116 actions/block.php:149
 #: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr ""
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr ""
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 #: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr ""
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr ""
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr ""
 
@@ -1426,12 +1529,14 @@ msgstr ""
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
 #: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
-#: actions/newnotice.php:162 lib/command.php:216
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr ""
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
 #: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr ""
 
@@ -1442,6 +1547,7 @@ msgstr ""
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
 #: actions/emailsettings.php:430 actions/emailsettings.php:437
 #: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr ""
 
@@ -1452,6 +1558,7 @@ msgstr ""
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr ""
 
@@ -1460,11 +1567,13 @@ msgstr ""
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
 #: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr ""
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr ""
 
@@ -1475,6 +1584,7 @@ msgstr ""
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 #: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr ""
 
@@ -1499,13 +1609,14 @@ msgstr ""
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
 #: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
 #: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
-#: actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
 #: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
-#: actions/twitapistatuses.php:399
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1515,13 +1626,15 @@ msgid "No such OpenID."
 msgstr ""
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr ""
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr ""
 
@@ -1566,11 +1679,15 @@ msgstr ""
 #: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
 #: lib/command.php:178 lib/command.php:227 lib/command.php:264
 #: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr ""
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 #: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr ""
 
@@ -1593,12 +1710,13 @@ msgstr ""
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
 #: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
 #: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
-#: lib/twitterapi.php:741
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr ""
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr ""
 
@@ -1609,11 +1727,12 @@ msgstr ""
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
 #: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-#: actions/register.php:189
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr ""
 
@@ -1623,6 +1742,9 @@ msgstr ""
 #: actions/profilesettings.php:195 actions/register.php:161
 #: actions/editgroup.php:188 actions/newgroup.php:138
 #: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1643,6 +1765,7 @@ msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
 #: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr ""
 
@@ -1653,12 +1776,13 @@ msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
-#: actions/twitapistatuses.php:284
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr ""
 
@@ -1677,6 +1801,8 @@ msgstr ""
 #: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61
 #: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr ""
 
@@ -1697,7 +1823,7 @@ msgid "Notice feed for %s"
 msgstr ""
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr ""
 
@@ -1705,19 +1831,20 @@ msgstr ""
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
 #: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
 #: actions/conversation.php:149 lib/facebookaction.php:572
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr ""
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
 #: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
-#: actions/twitapitags.php:69
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr ""
 
@@ -1784,7 +1911,7 @@ msgid "OpenID settings"
 msgstr ""
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-#: actions/invite.php:186 actions/invite.php:188
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
@@ -1801,17 +1928,20 @@ msgstr ""
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
 #: actions/login.php:214 lib/facebookaction.php:315
 #: actions/finishopenidlogin.php:117 actions/register.php:418
-#: lib/facebookaction.php:317
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr ""
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 #: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr ""
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 #: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr ""
 
@@ -1819,6 +1949,7 @@ msgstr ""
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 #: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr ""
 
@@ -1826,6 +1957,7 @@ msgstr ""
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr ""
 
@@ -1833,6 +1965,7 @@ msgstr ""
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr ""
 
@@ -1857,12 +1990,12 @@ msgid "Personal"
 msgstr ""
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-#: actions/invite.php:184 actions/invite.php:186
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr ""
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
-#: actions/smssettings.php:128
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
@@ -1874,7 +2007,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
@@ -1884,6 +2017,8 @@ msgstr ""
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
 #: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr ""
 
@@ -1893,39 +2028,44 @@ msgstr ""
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
 #: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr ""
 
 #: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
-#: lib/action.php:715
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr ""
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
 #: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
-#: classes/Notice.php:216 classes/Notice.php:232
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr ""
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
 #: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr ""
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr ""
 
@@ -1942,17 +2082,18 @@ msgstr ""
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
 #: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
-#: actions/public.php:120
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr ""
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
 #: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1963,11 +2104,13 @@ msgstr ""
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 #: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr ""
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 #: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr ""
 
@@ -1982,7 +2125,8 @@ msgstr ""
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
 #: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
 #: actions/register.php:108 actions/register.php:486 lib/action.php:440
-#: lib/facebookaction.php:281
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr ""
 
@@ -2000,13 +2144,14 @@ msgstr ""
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 #: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr ""
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
 #: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
-#: actions/register.php:461
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr ""
 
@@ -2016,7 +2161,7 @@ msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr ""
 
@@ -2030,7 +2175,9 @@ msgstr ""
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
-#: actions/twittersettings.php:118
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr ""
 
@@ -2055,28 +2202,32 @@ msgstr ""
 #: actions/replies.php:116 actions/repliesrss.php:67
 #: lib/personalgroupnav.php:104 actions/replies.php:118
 #: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 #: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr ""
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 #: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr ""
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
 #: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr ""
 
@@ -2091,11 +2242,12 @@ msgstr ""
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 #: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr ""
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377 actions/register.php:423
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2113,12 +2265,16 @@ msgstr ""
 #: actions/twittersettings.php:164 actions/othersettings.php:119
 #: actions/profilesettings.php:152 actions/subscriptions.php:185
 #: actions/twittersettings.php:180 lib/designsettings.php:256
-#: lib/groupeditform.php:196
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
 #: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr ""
 
@@ -2143,7 +2299,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr ""
 
@@ -2151,35 +2307,37 @@ msgstr ""
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
 #: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
 #: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
-#: lib/noticeform.php:179
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr ""
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
-#: actions/smssettings.php:162
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
-#: actions/imsettings.php:147
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
@@ -2190,6 +2348,7 @@ msgstr ""
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
 #: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr ""
 
@@ -2219,13 +2378,14 @@ msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
 #: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
-#: lib/action.php:717
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr ""
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
 #: actions/showstream.php:476 actions/showgroup.php:375
 #: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr ""
 
@@ -2242,6 +2402,7 @@ msgstr ""
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr ""
 
@@ -2255,13 +2416,13 @@ msgstr ""
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 #: actions/userauthorization.php:338 actions/userauthorization.php:344
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr ""
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 #: actions/userauthorization.php:349 actions/userauthorization.php:355
-#: actions/userauthorization.php:389
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr ""
 
@@ -2276,6 +2437,7 @@ msgstr ""
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
 #: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
 
@@ -2286,6 +2448,7 @@ msgstr ""
 #: actions/tagother.php:209 lib/profilelist.php:160
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr ""
 
@@ -2315,7 +2478,7 @@ msgid "That confirmation code is not for you!"
 msgstr ""
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-#: actions/emailsettings.php:328
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr ""
 
@@ -2325,49 +2488,52 @@ msgid "That file is too big."
 msgstr ""
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
 #: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
 #: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr ""
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr ""
 
@@ -2398,6 +2564,8 @@ msgstr ""
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
 #: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr ""
 
@@ -2440,7 +2608,7 @@ msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-#: actions/invite.php:130
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
@@ -2470,7 +2638,7 @@ msgstr ""
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
 #: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
 #: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
-#: actions/twitapistatuses.php:416
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
@@ -2483,6 +2651,12 @@ msgstr ""
 #: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
 #: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
 #: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2492,15 +2666,18 @@ msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
 #: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2510,18 +2687,20 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
 #: actions/profilesettings.php:109 actions/register.php:398
-#: actions/register.php:444
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
@@ -2536,16 +2715,19 @@ msgstr ""
 #: actions/avatarsettings.php:263 actions/emailsettings.php:247
 #: actions/grouplogo.php:324 actions/twittersettings.php:306
 #: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr ""
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 #: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr ""
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-#: actions/recoverpassword.php:210
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr ""
 
@@ -2580,22 +2762,24 @@ msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
 #: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr ""
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
 #: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
-#: actions/twitapistatuses.php:94
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
@@ -2603,6 +2787,8 @@ msgstr ""
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
 #: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
 #: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
@@ -2610,6 +2796,7 @@ msgstr ""
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
 #: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr ""
 
@@ -2626,7 +2813,7 @@ msgid "Upload a new profile image"
 msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-#: actions/invite.php:156
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -2634,6 +2821,7 @@ msgstr ""
 #: ../actions/register.php:159 ../actions/register.php:162
 #: actions/register.php:173 actions/register.php:176 actions/register.php:382
 #: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
@@ -2661,11 +2849,12 @@ msgstr ""
 #: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
 #: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr ""
 
@@ -2675,10 +2864,12 @@ msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
@@ -2686,7 +2877,8 @@ msgstr ""
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
 #: actions/profilesettings.php:119 actions/register.php:410
-#: actions/register.php:456
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -2707,7 +2899,7 @@ msgstr ""
 #: actions/block.php:148 actions/deletenotice.php:122
 #: actions/deletenotice.php:141 actions/deletenotice.php:115
 #: actions/block.php:150 actions/deletenotice.php:116
-#: actions/groupblock.php:177
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr ""
 
@@ -2728,7 +2920,7 @@ msgid "You are already logged in!"
 msgstr ""
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-#: actions/invite.php:122
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr ""
 
@@ -2766,6 +2958,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2774,13 +2967,14 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
 #: actions/finishopenidlogin.php:43 actions/register.php:149
-#: actions/register.php:186
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
@@ -2804,7 +2998,7 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 #: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
-#: actions/twitapistatuses.php:443
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr ""
 
@@ -2815,7 +3009,7 @@ msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-#: actions/invite.php:144
+#: actions/invite.php:144 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!"
@@ -2843,56 +3037,56 @@ msgid ""
 msgstr ""
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr ""
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr ""
 
 #: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
-#: lib/util.php:772
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr ""
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr ""
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr ""
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
-#: lib/util.php:776
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr ""
 
@@ -2914,7 +3108,7 @@ msgid "reply"
 msgstr ""
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr ""
 
@@ -2954,7 +3148,14 @@ msgstr ""
 #: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
 #: actions/othersettings.php:138 actions/recoverpassword.php:334
 #: actions/register.php:153 actions/twittersettings.php:310
-#: lib/designsettings.php:291
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2963,7 +3164,7 @@ msgid "This notice is not a favorite!"
 msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
-#: actions/twitapifavorites.php:188
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -2972,10 +3173,12 @@ msgid "Favor"
 msgstr ""
 
 #: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
@@ -2990,6 +3193,7 @@ msgstr ""
 #: actions/twitapifavorites.php:125 classes/Command.php:152
 #: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
 #: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr ""
 
@@ -3052,7 +3256,7 @@ msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
-#: actions/newmessage.php:155
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
@@ -3060,7 +3264,8 @@ msgstr ""
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
 #: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
-#: lib/command.php:230
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr ""
 
@@ -3069,17 +3274,19 @@ msgstr ""
 #: classes/Command.php:240 actions/newmessage.php:161
 #: actions/twitapidirect_messages.php:167 lib/command.php:240
 #: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
 #: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr ""
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
-#: actions/newmessage.php:71
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr ""
 
@@ -3136,7 +3343,8 @@ msgstr ""
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:182
 #: actions/grouplogo.php:183 actions/remotesubscribe.php:366
 #: actions/remotesubscribe.php:364 actions/userauthorization.php:215
-#: actions/userrss.php:103
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr ""
 
@@ -3166,6 +3374,7 @@ msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
 #: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3194,6 +3403,7 @@ msgstr ""
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
 #: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -3226,12 +3436,14 @@ msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
@@ -3243,6 +3455,7 @@ msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
@@ -3250,32 +3463,34 @@ msgstr ""
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
 #: actions/twitapidirect_messages.php:146
-#: actions/twitapidirect_messages.php:140
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
 #: actions/twitapidirect_messages.php:159
-#: actions/twitapidirect_messages.php:154
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
 #: actions/twitapidirect_messages.php:162
-#: actions/twitapidirect_messages.php:158
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
@@ -3439,41 +3654,42 @@ msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
 #: classes/Command.php:276 lib/command.php:145 lib/command.php:276
-#: lib/command.php:138 lib/command.php:269
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
 #: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
-#: lib/command.php:159
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
 #: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
-#: lib/command.php:182
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
 #: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
-#: lib/command.php:185
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
 #: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
-#: lib/command.php:188
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
 #: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
-#: lib/command.php:191
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
 #: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
-#: lib/command.php:194
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr ""
@@ -3485,61 +3701,63 @@ msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
 #: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
-#: actions/newmessage.php:182 lib/command.php:238
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
 #: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
-#: lib/command.php:240
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
 #: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
-#: lib/command.php:293
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
 #: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
-#: lib/command.php:300
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
 #: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
-#: lib/command.php:321
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
 #: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
-#: lib/command.php:328
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
 #: classes/Command.php:376 lib/command.php:353 lib/command.php:376
-#: lib/command.php:346 lib/command.php:369
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
 #: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
-#: lib/command.php:349
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
 #: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
-#: lib/command.php:351
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
 #: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
-#: lib/command.php:372
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
 #: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
-#: lib/command.php:374
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3547,11 +3765,11 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3593,7 +3811,7 @@ msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 #: actions/favoritesrss.php:110 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:115
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
@@ -3633,7 +3851,7 @@ msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 #: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
-#: lib/noticelist.php:433
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr ""
 
@@ -3644,7 +3862,7 @@ msgstr ""
 
 #: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
 #: actions/facebookhome.php:161 actions/all.php:48
-#: actions/facebookhome.php:156
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr ""
@@ -3656,6 +3874,7 @@ msgstr ""
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
 #: actions/grouplogo.php:250 actions/avatarsettings.php:119
 #: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr ""
 
@@ -3663,6 +3882,7 @@ msgstr ""
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
 #: actions/avatarsettings.php:126 actions/avatarsettings.php:202
 #: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
@@ -3670,11 +3890,13 @@ msgstr ""
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
 #: actions/avatarsettings.php:141 actions/avatarsettings.php:214
 #: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
 #: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
@@ -3697,11 +3919,13 @@ msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
 #: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
 #: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr ""
 
@@ -3709,6 +3933,7 @@ msgstr ""
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
 #: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
 #: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr ""
 
@@ -3766,7 +3991,8 @@ msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-#: actions/grouplogo.php:75 actions/editgroup.php:73
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
@@ -3775,6 +4001,8 @@ msgstr ""
 #: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:89
 #: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr ""
 
@@ -3783,18 +4011,23 @@ msgstr ""
 #: actions/showgroup.php:128 actions/grouplogo.php:104
 #: actions/grouprss.php:103 actions/blockedfromgroup.php:80
 #: actions/editgroup.php:101 actions/groupdesignsettings.php:102
-#: actions/showgroup.php:133
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr ""
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
 #: actions/grouplogo.php:107 actions/grouplogo.php:111
 #: actions/editgroup.php:108 actions/editgroup.php:167
-#: actions/groupdesignsettings.php:109
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr ""
 
 #: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3829,6 +4062,7 @@ msgid "Send me email when someone "
 msgstr ""
 
 #: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3867,18 +4101,21 @@ msgstr ""
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
 #: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
 #: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
 #: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
 #: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr ""
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
 #: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
 #: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr ""
 
@@ -3959,6 +4196,7 @@ msgstr ""
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
 #: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
 #: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr ""
 
@@ -3987,16 +4225,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
 #: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr ""
 
@@ -4005,10 +4244,12 @@ msgid "You can upload a logo image for your group."
 msgstr ""
 
 #: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr ""
 
 #: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr ""
 
@@ -4075,20 +4316,20 @@ msgstr ""
 msgid "A confirmation code was sent "
 msgstr ""
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr ""
 
-#: actions/joingroup.php:128 actions/joingroup.php:133
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr ""
 
-#: actions/joingroup.php:135 actions/joingroup.php:140
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr ""
@@ -4097,16 +4338,18 @@ msgstr ""
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
 #: actions/leavegroup.php:88 actions/groupblock.php:86
 #: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr ""
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr ""
 
@@ -4115,20 +4358,24 @@ msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
 #: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr ""
 
 #: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr ""
 
 #: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -4140,15 +4387,17 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
 #: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr ""
 
 #: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr ""
 
@@ -4161,12 +4410,13 @@ msgid "Don't send a message to yourself; "
 msgstr ""
 
 #: actions/newnotice.php:166 actions/newnotice.php:174
-#: actions/newnotice.php:272
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr ""
 
 #: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
 #: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr ""
 
@@ -4208,10 +4458,12 @@ msgid "Service"
 msgstr ""
 
 #: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
 #: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr ""
 
@@ -4220,6 +4472,7 @@ msgid "Change your password."
 msgstr ""
 
 #: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr ""
 
@@ -4238,11 +4491,12 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr ""
 
 #: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4253,20 +4507,24 @@ msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
 #: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr ""
 
 #: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr ""
 
 #: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
 #: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
@@ -4291,7 +4549,8 @@ msgid "Tag cloud"
 msgstr ""
 
 #: actions/register.php:139 actions/register.php:349 actions/register.php:79
-#: actions/register.php:177 actions/register.php:394
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4341,6 +4600,7 @@ msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
 #: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr ""
@@ -4361,7 +4621,7 @@ msgid "%s group, page %d"
 msgstr ""
 
 #: actions/showgroup.php:206 actions/showgroup.php:208
-#: actions/showgroup.php:213
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr ""
 
@@ -4370,7 +4630,9 @@ msgstr ""
 #: actions/showgroup.php:253 actions/showstream.php:271
 #: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
 #: actions/showstream.php:236 actions/userauthorization.php:137
-#: lib/profilelist.php:197
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
@@ -4379,12 +4641,14 @@ msgstr ""
 #: actions/showgroup.php:264 actions/showstream.php:282
 #: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
 #: actions/showstream.php:247 actions/userauthorization.php:149
-#: lib/profilelist.php:212
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr ""
 
 #: actions/showgroup.php:270 actions/showgroup.php:272
-#: actions/showgroup.php:288
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
@@ -4395,7 +4659,8 @@ msgstr ""
 
 #: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
 #: actions/showgroup.php:384 actions/showgroup.php:373
-#: actions/showgroup.php:430
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr ""
 
@@ -4404,11 +4669,12 @@ msgstr ""
 #: lib/tagcloudsection.php:71 actions/showgroup.php:344
 #: actions/showgroup.php:378 lib/profileaction.php:117
 #: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
 #: actions/showgroup.php:370 actions/showgroup.php:350
-#: actions/showgroup.php:384
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr ""
 
@@ -4434,24 +4700,28 @@ msgstr ""
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr ""
 
 #: actions/showstream.php:240 actions/tagother.php:81
 #: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
-#: actions/showstream.php:274
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr ""
 
 #: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr ""
 
 #: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr ""
 
@@ -4482,7 +4752,7 @@ msgstr ""
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr ""
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr ""
 
@@ -4541,11 +4811,11 @@ msgid "These are the people whose "
 msgstr ""
 
 #: actions/subscriptions.php:122 actions/subscriptions.php:124
-#: actions/subscriptions.php:183
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr ""
 
-#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr ""
@@ -4605,15 +4875,17 @@ msgid "Microblog tagged with %s"
 msgstr ""
 
 #: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
 #: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
 #: actions/twitapiusers.php:48 actions/twitapiusers.php:52
-#: actions/twitapiusers.php:50
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr ""
 
@@ -4647,19 +4919,20 @@ msgstr ""
 msgid "Error removing the block."
 msgstr ""
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr ""
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr ""
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""
 
 #: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr ""
@@ -4670,56 +4943,61 @@ msgid "%s groups, page %d"
 msgstr ""
 
 #: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr ""
 
 #: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr ""
 
 #: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr ""
 
-#: lib/action.php:130 lib/action.php:132 lib/action.php:142
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr ""
 
-#: lib/action.php:145 lib/action.php:147 lib/action.php:157
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316 lib/action.php:387 lib/action.php:411
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322 lib/action.php:393 lib/action.php:417
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328 lib/action.php:399 lib/action.php:419
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr ""
 
-#: lib/action.php:328 lib/action.php:399 lib/action.php:419
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
@@ -4727,15 +5005,15 @@ msgstr ""
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332 lib/action.php:409 lib/action.php:435
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335 lib/action.php:412 lib/action.php:443
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338 lib/action.php:415 lib/action.php:440
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr ""
 
@@ -4743,44 +5021,46 @@ msgstr ""
 msgid "Login with OpenID"
 msgstr ""
 
-#: lib/action.php:344 lib/action.php:421 lib/action.php:446
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr ""
 
-#: lib/action.php:362 lib/action.php:441 lib/action.php:468
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr ""
 
-#: lib/action.php:417 lib/action.php:504 lib/action.php:531
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472 lib/action.php:559 lib/action.php:597
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr ""
 
-#: lib/action.php:562 lib/action.php:654 lib/action.php:699
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr ""
 
 #: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
-#: lib/action.php:749 lib/action.php:770
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630 lib/action.php:727 lib/action.php:779
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635 lib/action.php:732 lib/action.php:784
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr ""
 
 #: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr ""
 
 #: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr ""
 
@@ -4821,14 +5101,17 @@ msgid "All"
 msgstr ""
 
 #: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
 #: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
 #: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
@@ -4837,6 +5120,7 @@ msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
 #: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr ""
 
@@ -4845,6 +5129,7 @@ msgid "Describe the group or topic in 140 chars"
 msgstr ""
 
 #: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
@@ -4896,11 +5181,11 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr ""
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr ""
 
@@ -4957,15 +5242,16 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-#: lib/messageform.php:110 lib/messageform.php:109
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125 lib/noticeform.php:128
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr ""
 
-#: lib/noticeform.php:152 lib/noticeform.php:149
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr ""
 
@@ -4975,21 +5261,23 @@ msgstr ""
 
 #: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
 #: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr ""
 
 #: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr ""
 
 #: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
 #: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
-#: lib/noticelist.php:486
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr ""
 
 #: lib/noticelist.php:474 actions/avatarsettings.php:148
-#: lib/noticelist.php:479 lib/noticelist.php:486
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr ""
 
@@ -5064,6 +5352,7 @@ msgid "Groups %s is a member of"
 msgstr ""
 
 #: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
@@ -5073,7 +5362,7 @@ msgid "User has blocked you."
 msgstr ""
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
-#: actions/userauthorization.php:178
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr ""
 
@@ -5098,22 +5387,22 @@ msgstr ""
 msgid "Unsubscribe from this user"
 msgstr ""
 
-#: actions/all.php:77 actions/all.php:59
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr ""
 
-#: actions/all.php:82 actions/all.php:64
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr ""
 
-#: actions/all.php:87 actions/all.php:69
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
-#: actions/all.php:112 actions/all.php:125
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
 msgid "You and friends"
 msgstr ""
 
@@ -5133,17 +5422,17 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/deletenotice.php:73
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:127
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
 msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
@@ -5166,13 +5455,13 @@ msgid ""
 "latest notice, you need to give it permission."
 msgstr ""
 
-#: actions/grouplogo.php:155
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
-#: actions/grouplogo.php:367
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
@@ -5214,19 +5503,19 @@ msgid ""
 "before changing your settings."
 msgstr ""
 
-#: actions/public.php:125 actions/public.php:133
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: actions/public.php:130 actions/public.php:138
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/public.php:135 actions/public.php:143
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:210 actions/public.php:241
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5243,21 +5532,23 @@ msgid ""
 "Try our [OpenID registration](%%action.openidlogin%%)!)"
 msgstr ""
 
-#: actions/register.php:432 actions/register.php:479
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/register.php:433 actions/register.php:480
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
 msgstr ""
 
 #: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
 msgid "Created"
 msgstr ""
 
 #: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5297,18 +5588,22 @@ msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
 msgid "Edit Avatar"
 msgstr ""
 
 #: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
 msgid "Edit profile settings"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5317,7 +5612,7 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/smssettings.php:335
+#: actions/smssettings.php:335 actions/smssettings.php:347
 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."
@@ -5342,7 +5637,14 @@ msgid ""
 msgstr ""
 
 #: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
-#: actions/twitapistatuses.php:314
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
 msgid "No such user!"
 msgstr ""
 
@@ -5368,7 +5670,7 @@ msgstr ""
 msgid "Search for more groups"
 msgstr ""
 
-#: classes/Notice.php:138 classes/Notice.php:154
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -5378,11 +5680,11 @@ msgstr ""
 msgid "Connect to SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:671 lib/action.php:721
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
 msgid "Badge"
 msgstr ""
 
-#: lib/command.php:113 lib/command.php:106
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5559,20 +5861,20 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: actions/all.php:80
+#: actions/all.php:80 actions/all.php:127
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
 
-#: actions/all.php:85
+#: actions/all.php:85 actions/all.php:132
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
 
-#: actions/all.php:87
+#: actions/all.php:87 actions/all.php:134
 #, php-format
 msgid ""
 "You can try to [nudge %s](../%s) from his profile or [post something to his "
@@ -5580,6 +5882,7 @@ msgid ""
 msgstr ""
 
 #: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -5620,30 +5923,39 @@ msgstr ""
 msgid "Conversation"
 msgstr ""
 
-#: actions/deletenotice.php:115
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
 msgid "Do not delete this notice"
 msgstr ""
 
 #: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
 #: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
 
 #: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
 #: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
 msgid "Could not create aliases."
 msgstr ""
 
@@ -5702,6 +6014,7 @@ msgid "User is not a member of group."
 msgstr ""
 
 #: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
 msgid "Block user from group"
 msgstr ""
 
@@ -5717,15 +6030,15 @@ msgstr ""
 msgid "Database error blocking user from group."
 msgstr ""
 
-#: actions/groupdesignsettings.php:73
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
 msgstr ""
 
-#: actions/groupdesignsettings.php:146
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
 msgid "Group design"
 msgstr ""
 
-#: actions/groupdesignsettings.php:157
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -5733,28 +6046,32 @@ msgstr ""
 
 #: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
 #: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
 msgid "Couldn't update your design."
 msgstr ""
 
 #: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
 msgid "Unable to save your design settings!"
 msgstr ""
 
 #: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
 msgid "Design preferences saved."
 msgstr ""
 
-#: actions/groupmembers.php:438
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
 msgid "Make user an admin of the group"
 msgstr ""
 
-#: actions/groupmembers.php:470
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
 msgid "Make Admin"
 msgstr ""
 
-#: actions/groupmembers.php:470
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
 msgid "Make this user an admin"
 msgstr ""
 
@@ -5789,7 +6106,8 @@ msgstr ""
 msgid "Invites have been disabled."
 msgstr ""
 
-#: actions/joingroup.php:100
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -5812,50 +6130,51 @@ msgstr ""
 msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: actions/newmessage.php:178
+#: actions/newmessage.php:178 actions/newmessage.php:181
 msgid "Message sent"
 msgstr ""
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr ""
 
-#: actions/newnotice.php:128 scripts/maildaemon.php:185
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
 #, php-format
 msgid " Try using another %s format."
 msgstr ""
 
-#: actions/newnotice.php:133 scripts/maildaemon.php:190
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
 #, php-format
 msgid "%s is not a supported filetype on this server."
 msgstr ""
 
-#: actions/newnotice.php:205
+#: actions/newnotice.php:205 lib/mediafile.php:142
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: actions/newnotice.php:208
+#: actions/newnotice.php:208 lib/mediafile.php:147
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
-#: actions/newnotice.php:211
+#: actions/newnotice.php:211 lib/mediafile.php:152
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: actions/newnotice.php:214
+#: actions/newnotice.php:214 lib/mediafile.php:159
 msgid "Missing a temporary folder."
 msgstr ""
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:217 lib/mediafile.php:162
 msgid "Failed to write file to disk."
 msgstr ""
 
-#: actions/newnotice.php:220
+#: actions/newnotice.php:220 lib/mediafile.php:165
 msgid "File upload stopped by extension."
 msgstr ""
 
@@ -5871,12 +6190,14 @@ msgstr ""
 msgid "Somehow lost the login in saveFile"
 msgstr ""
 
-#: actions/newnotice.php:309 scripts/maildaemon.php:127
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: actions/newnotice.php:336 actions/newnotice.php:360
-#: scripts/maildaemon.php:148 scripts/maildaemon.php:167
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
@@ -5901,19 +6222,19 @@ msgid ""
 "account. Manage your associated OpenIDs from here."
 msgstr ""
 
-#: actions/othersettings.php:110
+#: actions/othersettings.php:110 actions/othersettings.php:117
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:115
+#: actions/othersettings.php:115 actions/othersettings.php:122
 msgid "View profile designs"
 msgstr ""
 
-#: actions/othersettings.php:116
+#: actions/othersettings.php:116 actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/public.php:82
+#: actions/public.php:82 actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)"
 msgstr ""
@@ -5935,7 +6256,7 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:245
+#: actions/public.php:245 actions/public.php:238
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5977,25 +6298,25 @@ msgstr ""
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/remotesubscribe.php:100
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
 msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/replies.php:179
+#: actions/replies.php:179 actions/replies.php:198
 #, php-format
 msgid ""
 "This is the timeline showing replies to %s but %s hasn't received a notice "
 "to his attention yet."
 msgstr ""
 
-#: actions/replies.php:184
+#: actions/replies.php:184 actions/replies.php:203
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:186
+#: actions/replies.php:186 actions/replies.php:205
 #, php-format
 msgid ""
 "You can try to [nudge %s](../%s) or [post something to his or her attention]"
@@ -6007,13 +6328,13 @@ msgstr ""
 msgid "%s's favorite notices, page %d"
 msgstr ""
 
-#: actions/showfavorites.php:170
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
 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:172
+#: actions/showfavorites.php:172 actions/showfavorites.php:207
 #, php-format
 msgid ""
 "%s hasn't added any notices to his favorites yet. Post something interesting "
@@ -6028,30 +6349,31 @@ msgid ""
 "would add to thier favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:226
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
 msgid "This is a way to share what you like."
 msgstr ""
 
 #: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:328
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
-#: actions/showgroup.php:330 actions/tag.php:84
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
-#: actions/showgroup.php:337
+#: actions/showgroup.php:337 actions/showgroup.php:340
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
-#: actions/showgroup.php:446
+#: actions/showgroup.php:446 actions/showgroup.php:454
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6060,7 +6382,7 @@ msgid ""
 "their life and interests. "
 msgstr ""
 
-#: actions/showgroup.php:474
+#: actions/showgroup.php:474 actions/showgroup.php:482
 msgid "Admins"
 msgstr ""
 
@@ -6078,25 +6400,25 @@ msgstr ""
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showstream.php:350
+#: actions/showstream.php:350 actions/showstream.php:444
 #, php-format
 msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: actions/showstream.php:355
+#: actions/showstream.php:355 actions/showstream.php:449
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:357
+#: actions/showstream.php:357 actions/showstream.php:451
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
 "action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/showstream.php:393
+#: actions/showstream.php:393 actions/showstream.php:492
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6122,7 +6444,7 @@ msgid ""
 "%) and be the first?"
 msgstr ""
 
-#: actions/subscriptions.php:115
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6133,29 +6455,31 @@ msgid ""
 msgstr ""
 
 #: actions/subscriptions.php:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr ""
 
-#: actions/tag.php:77
+#: actions/tag.php:77 actions/tag.php:86
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/tag.php:91
+#: actions/tag.php:91 actions/tag.php:98
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 
-#: actions/twitapifavorites.php:125
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
 msgid "This status is already a favorite!"
 msgstr ""
 
-#: actions/twitapifavorites.php:179
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite!"
 msgstr ""
 
 #: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
 msgid "Could not determine source user."
 msgstr ""
 
@@ -6163,16 +6487,17 @@ msgstr ""
 msgid "Target user not specified."
 msgstr ""
 
-#: actions/twitapifriendships.php:221
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
 msgid "Could not find target user."
 msgstr ""
 
-#: actions/twitapistatuses.php:322
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
 
-#: actions/twitapitags.php:74
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
@@ -6181,11 +6506,11 @@ msgstr ""
 msgid "Import my Friends Timeline."
 msgstr ""
 
-#: actions/userauthorization.php:158
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
 msgid "License"
 msgstr ""
 
-#: actions/userauthorization.php:179
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
 msgid "Reject this subscription"
 msgstr ""
 
@@ -6213,41 +6538,42 @@ msgstr ""
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: classes/File.php:127
+#: classes/File.php:127 classes/File.php:137
 #, php-format
 msgid ""
 "No file may be larger than %d bytes and the file you sent was %d bytes. Try "
 "to upload a smaller version."
 msgstr ""
 
-#: classes/File.php:137
+#: classes/File.php:137 classes/File.php:147
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
-#: classes/File.php:145
+#: classes/File.php:145 classes/File.php:154
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#: classes/Notice.php:139
+#: classes/Notice.php:139 classes/Notice.php:179
 msgid "Problem saving notice. Too long."
 msgstr ""
 
-#: classes/User.php:319
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
 msgid "Design"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
 msgid "Design your profile"
 msgstr ""
 
-#: lib/action.php:712
+#: lib/action.php:712 lib/action.php:727
 msgid "TOS"
 msgstr ""
 
@@ -6336,15 +6662,15 @@ msgstr ""
 msgid "Save design"
 msgstr ""
 
-#: lib/designsettings.php:378
+#: lib/designsettings.php:378 lib/designsettings.php:369
 msgid "Bad default color settings: "
 msgstr ""
 
-#: lib/designsettings.php:474
+#: lib/designsettings.php:474 lib/designsettings.php:465
 msgid "Design defaults restored."
 msgstr ""
 
-#: lib/groupeditform.php:181
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
@@ -6432,15 +6758,15 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/noticeform.php:154
+#: lib/noticeform.php:154 lib/noticeform.php:180
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:158
+#: lib/noticeform.php:158 lib/noticeform.php:184
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:436
+#: lib/noticelist.php:436 lib/noticelist.php:478
 msgid "in context"
 msgstr ""
 
@@ -6448,7 +6774,7 @@ msgstr ""
 msgid "User ID"
 msgstr ""
 
-#: lib/searchaction.php:156
+#: lib/searchaction.php:156 lib/searchaction.php:162
 msgid "Search help"
 msgstr ""
 
@@ -6471,3 +6797,495 @@ msgstr ""
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr ""
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
+msgstr ""
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, php-format
+msgid "Description is too long (max %d chars)."
+msgstr ""
+
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr ""
+
+#: actions/apigroupjoin.php:138
+#, php-format
+msgid "Could not join user %s to group %s."
+msgstr ""
+
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr ""
+
+#: actions/apigroupleave.php:124
+#, php-format
+msgid "Could not remove user %s to group %s."
+msgstr ""
+
+#: actions/apigrouplist.php:95
+#, php-format
+msgid "%s's groups"
+msgstr ""
+
+#: actions/apigrouplist.php:103
+#, php-format
+msgid "Groups %s is a member of on %s."
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr ""
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr ""
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr ""
+
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:109
+msgid "Could not convert request token to access token."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr ""
+
+#: actions/getfile.php:75
+msgid "No such file."
+msgstr ""
+
+#: actions/getfile.php:79
+msgid "Cannot read file."
+msgstr ""
+
+#: actions/grouprss.php:133
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr ""
+
+#: actions/imsettings.php:89
+msgid "IM is not available."
+msgstr ""
+
+#: actions/login.php:259
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+
+#: actions/noticesearchrss.php:89
+#, php-format
+msgid "Updates with \"%s\""
+msgstr ""
+
+#: actions/noticesearchrss.php:91
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr ""
+
+#: actions/oembed.php:157
+msgid "content type "
+msgstr ""
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr ""
+
+#: actions/profilesettings.php:125 actions/register.php:457
+msgid "Describe yourself and your interests"
+msgstr ""
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr ""
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr ""
+
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
+msgstr ""
+
+#: actions/replies.php:144
+#, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/replies.php:151
+#, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/replies.php:158
+#, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr ""
+
+#: actions/repliesrss.php:72
+#, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr ""
+
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showfavorites.php:177
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr ""
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr ""
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr ""
+
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr ""
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr ""
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: 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:249
+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:261
+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:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr ""
+
+#: lib/action.php:435
+msgid "Connect to services"
+msgstr ""
+
+#: lib/action.php:785
+msgid "Site content license"
+msgstr ""
+
+#: lib/command.php:88
+#, php-format
+msgid "Could not find a user with nickname %s"
+msgstr ""
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, php-format
+msgid "Reply to %s sent"
+msgstr ""
+
+#: lib/command.php:441
+msgid "Error saving notice."
+msgstr ""
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+msgid "No configuration file found. "
+msgstr ""
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr ""
+
+#: lib/jabber.php:192
+#, php-format
+msgid "notice id: %s"
+msgstr ""
+
+#: lib/mail.php:554
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr ""
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr ""
+
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
+msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo
index 2cb0397ec..2b81e4b3d 100644
--- a/locale/sv/LC_MESSAGES/statusnet.mo
+++ b/locale/sv/LC_MESSAGES/statusnet.mo
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index d0a5001da..d30753a0f 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -1,30 +1,30 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Swedish
 #
+# Author@translatewiki.net: Micke
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-17 10:54+0000\n"
-"Last-Translator: Per-Olov Jernberg <possan@possan.se>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:33+0000\n"
+"Language-Team: Swedish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Sök i strömmen efter \"%s\""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -37,17 +37,19 @@ msgid " from "
 msgstr "från"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Uppdateringar med svar till %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s har bjudit in dig till %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -102,6 +104,7 @@ msgstr ""
 "Om inte, då kan du ignorera detta meddelande. Tack för att du tog dig\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s lyssnar nu på dina meddelanden i %2$s."
@@ -122,25 +125,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s uppdateringar med svar till uppdatering från %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s's status den %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s(%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Publik Ström"
@@ -150,34 +156,48 @@ msgstr "%s Publik Ström"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s med vänner"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publika tidslinje"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidslinje"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s uppdateringar ifrån allihop!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -185,7 +205,8 @@ msgstr ""
 "(Du kommer få ett meddelande med email inom kort med instruktioner hur du "
 "bekräftar din emailadress)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -194,7 +215,8 @@ msgstr ""
 "**%%site.name%%** är en mikroblogg service för dig ifrån [%%site.broughtby%%]"
 "(%%site.broughtbyurl%%)"
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** är en mikroblogg service."
@@ -206,32 +228,36 @@ msgstr ". Användarna är tydligt markerade med sitt fulla namn eller smeknamn."
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste fyllas "
 "i."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "Minst 6 tecken"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "Minst 6 tecken och glöm inte bort det!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 eller fler tecken. MÃ¥ste fyllas i."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -241,6 +267,7 @@ msgstr ""
 "godkänna att %s får skicka meddelanden till dig."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -276,7 +303,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API-metoden hittades inte!"
 
@@ -299,16 +353,23 @@ msgstr "API-metoden hittades inte!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "API-metoden är under uppbyggnad."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Om"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Acceptera"
 
@@ -319,6 +380,9 @@ msgstr "Acceptera"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Lägg till"
 
@@ -336,27 +400,29 @@ msgstr "Lägg till eller ta bort OpenID"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Adress"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Adresser till vänner att bjuda in (en rad per adress)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Alla prenumerationer"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "%s alla uppdateringar"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Alla uppdateringar som matchar söksträngen \"%s\""
@@ -366,30 +432,37 @@ msgstr "Alla uppdateringar som matchar söksträngen \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Redan inloggad."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Det finns redan en prenumeration!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Är du säker på att du vill tabort detta inlägg?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Tillåt prenumeration."
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logga in automatiskt i framtiden; Ej för publika datorer!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -399,15 +472,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Användarbild"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Användarbilden uppdaterad."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -417,6 +494,7 @@ msgstr ""
 "vidare instruktioner. (La du till %s i din vännerlista?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -425,18 +503,19 @@ msgstr ""
 "efter meddelande om vidare instruktioner."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Väntar bekräftelse på detta telefonnummer. "
 
 #: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
 msgid "Before »"
-msgstr "Tidigare »"
+msgstr "Före"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Biografi"
 
@@ -444,16 +523,18 @@ msgstr "Biografi"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Biografin är för lång (max 140 tecken)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Kan inte ta bort detta inlägg."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Kan inte läsa användarbild URL '%s'"
@@ -461,6 +542,8 @@ msgstr "Kan inte läsa användarbild URL '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Kan inte spara det nya lösenordet."
 
@@ -468,31 +551,34 @@ msgstr "Kan inte spara det nya lösenordet."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Kan inte initiera OpenID objekt."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Kan inte normalisera det Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "Kan inte normalisera den emailadressen"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Ändra"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Ändra email hantering"
 
@@ -502,11 +588,12 @@ msgid "Change password"
 msgstr "Byt lösenord"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Ändra ditt lösenord"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Ändra dina profilinställningar"
 
@@ -516,6 +603,9 @@ msgstr "Ändra dina profilinställningar"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Bekräfta"
 
@@ -528,12 +618,14 @@ msgstr "Bekräfta adress"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Verifikation avbruten"
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Bekräftelsekod"
 
@@ -542,7 +634,8 @@ msgstr "Bekräftelsekod"
 msgid "Confirmation code not found."
 msgstr "Bekräftelsekoden kunde inte hittas."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -576,20 +669,24 @@ msgstr ""
 "service."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Anslut"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Anslut till existerande konto"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Kontakta"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Kan inte skapa OpenID formulär: %s"
@@ -597,35 +694,39 @@ msgstr "Kan inte skapa OpenID formulär: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kunde inte följa användaren: %s finns redan i din lista."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Kunde inte skicka vidare till servern: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Kunde inte spara informationen om användarbild"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Kunde inte spara informationen om den nya profilen"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "Kunde inte prenumerera på annat åt dig."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "Kunde inte prenumerera."
 
@@ -645,15 +746,17 @@ msgstr "Kunde inte konvertera förfrågan tokens till Access tokens."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Kunde inte radera epost bekräftelsen."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Kunde inte radera prenumerationen. "
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Kunde inte få fram status."
 
@@ -666,29 +769,38 @@ msgstr "Kunde inte få en förfrågan token."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Kunde inte lägga till bekräftelsekoden."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Kunde inte lägga till ny prenumeration."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Kunde inte spara profil."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "Kunde inte uppdatera användarens inställningar."
 
@@ -704,42 +816,48 @@ msgstr "Kunde inte uppdatera användarens inställningar."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Kunde inte uppdatera användare."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Skapa"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Skapa en ny användare med det här smeknamnet"
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Skapa ett nytt konto"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Skapar ett nytt konto för OpenID som redan har en användare"
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Nuvarande bekäftat SMS telefonnummer"
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Nuvarande bekräftade emailadress."
 
@@ -748,23 +866,27 @@ msgid "Currently"
 msgstr "Just nu"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "DB error vid infog av hashtag: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Databasfel för svar: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Tabort inlägg"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
 
@@ -772,11 +894,13 @@ msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Epost"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Emailadress"
 
@@ -786,39 +910,43 @@ msgid "Email Settings"
 msgstr "Email inställningar"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Epostadressen finns redan."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Bekräfta epostadress"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Emailadress såsom \"användare@exempel.se\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Emailadresser"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Skriv in ett smeknamn eller en epostadress."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Fyll i koden du mottog i din telefon."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Felaktig bekräftelse av token"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Lyckades inte ansluta användaren till OpenID."
 
@@ -829,39 +957,46 @@ msgstr "Lyckades inte ansluta användaren."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Fel uppstog när användarbild skulle läggas till"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Fel uppstog när nya profilen skulle läggas till"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Fel uppstog när fjärrprofilen skulle läggas till"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Fel uppstog när adressen skulle bekräftas."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Fel uppstog när fjärrprofil skulle sparas"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Fel uppstog när profilen skulle sparas."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Fel uppstog när användaren skulle sparas."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Fel uppstog när användare skulle sparas."
 
@@ -870,6 +1005,9 @@ msgstr "Fel uppstog när användare skulle sparas."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Fel uppstog i användarens inställning"
 
@@ -880,6 +1018,7 @@ msgstr "Fel uppstog vid uppdatering av profilen"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Fel uppstog under uppdatering av fjärranvändare"
 
@@ -889,33 +1028,36 @@ msgid "Error with confirmation code."
 msgstr "Fel uppstog med bekräftelsekoden."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Nuvarande smeknamn"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "Frågor & svar"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Uppdatering av profilbild misslyckades."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Flöden för $s vänner"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Flöde för svar till %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Feed för taggar %s"
@@ -930,7 +1072,7 @@ msgstr "Sök innehåll i inlägg"
 msgid "Find people on this site"
 msgstr "Sök personer på denna sida"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -943,6 +1085,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Ditt fulla namn."
 
@@ -951,23 +1098,33 @@ msgstr "Ditt fulla namn."
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ditt namn är för långt (max 255 tecken)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Hjälp"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Hem"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Hemsida"
 
@@ -975,21 +1132,27 @@ msgstr "Hemsida"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Hemsidan har ingen giltig URL"
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Jag vill posta inlägg via min email."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM adress"
 
@@ -999,7 +1162,7 @@ msgid "IM Settings"
 msgstr "IM inställningar"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1007,7 +1170,7 @@ msgstr ""
 "Om du redan har ett konto, logga in med ditt användarnamn och lösenord för "
 "att koppla det till ditt OpenID"
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1015,7 +1178,7 @@ msgstr ""
 "Om du vill lägga till OpenID till ditt konto, fyll i fältet nedan och tryck "
 "på \"Add\""
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1026,25 +1189,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Inkommande email"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "Inkommande emailadress borttagen."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Felaktigt, gammalt lösenord"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1053,30 +1222,31 @@ msgstr ""
 "postadress "
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Ogiltig användarbild URL '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Ogiltig emailadress: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ogiltig hemsideadress '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ogiltig licens URL '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Ogiltig innehåll i inlägget "
 
@@ -1091,13 +1261,13 @@ msgid "Invalid notice url"
 msgstr "Ogiltig inlägg url"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Ogiltig profil URL '%s' "
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "Nåt är fel med profil URL (Format fel)"
 
@@ -1115,44 +1285,52 @@ msgstr "Felaktig storlek"
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Inbjudan(ar) skickad"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Inbjudan(ar) är skickade till följande personer:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Bjud in"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Bjud in nya användare"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, 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 ""
-"Det drivs med [StatusNet](http://status.net/) mikroblogging software, version %"
-"s, tillgängligt under [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+"Det drivs med [StatusNet](http://status.net/) mikroblogging software, "
+"version %s, tillgängligt under [GNU Affero General Public License](http://"
+"www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID används redan utav en annan användare."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1162,12 +1340,14 @@ msgstr ""
 "att lägga till %s i din vännerlista i IM klienten eller GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Språk"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Språket är för långt(max 50 tecken)."
 
@@ -1176,7 +1356,15 @@ msgstr "Språket är för långt(max 50 tecken)."
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Plats"
 
@@ -1185,7 +1373,12 @@ msgstr "Plats"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Platse är för lång (max 255 tecken)."
 
@@ -1194,18 +1387,22 @@ msgstr "Platse är för lång (max 255 tecken)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Logga in"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Logga in med ett [OpenID](%%doc.openid%%) konto."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1216,22 +1413,26 @@ msgstr ""
 "[Registrera](%%action.register%%) ett nytt konto, eller testa [OpenID](%%"
 "action.openidlogin%%)."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Logga ut"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Långt namn, förslagsvis ditt \"riktiga\" namn"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Glömt bort lösenord?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Skapa en ny emailadress för att posta till, avaktiverar den gamla"
 
@@ -1242,16 +1443,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Ställ in hur du tar emot email ifrån %%site.name%%"
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Medlem sedan"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Mikroblogg av %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1264,42 +1467,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Min text och filer finns tillgängliga under"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Ny"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Ny emailadress för att skicka till %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "Ny inkommande emailadress inlagd."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Nytt användarnamn"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Nytt inlägg"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nya lösenordet har blivit sparat. Du är nu även inloggad."
 
@@ -1309,7 +1520,13 @@ msgstr "Nya lösenordet har blivit sparat. Du är nu även inloggad."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Smeknamn"
 
@@ -1318,7 +1535,12 @@ msgstr "Smeknamn"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Användarnamnet används redan, försök med ett annat."
 
@@ -1327,48 +1549,59 @@ msgstr "Användarnamnet används redan, försök med ett annat."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Inget giltigt smeknamn."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Smeknamnet på användaren du vill följa"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Smeknamn eller epost"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "Nej"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Inget Jabber ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Ingen rättighet förfrågan!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Ingen operatör vald."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Ingen kod är ifylld"
 
@@ -1380,11 +1613,15 @@ msgstr "Ingen bekräftelsekod."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Inget innehåll!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Ingen emailadress."
 
@@ -1393,7 +1630,9 @@ msgid "No id."
 msgstr "Inget id."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "Ingen inkommande emailadress."
 
@@ -1404,6 +1643,7 @@ msgstr "Inget smeknamn lämnades ut av fjärrservern."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Inget användarnamn"
 
@@ -1411,12 +1651,14 @@ msgstr "Inget användarnamn"
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Ingen väntande bekräftelse att avbryta."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Inget telefonnummer."
 
@@ -1426,7 +1668,8 @@ msgid "No profile URL returned by server."
 msgstr "Ingen profil URL lämnades ut av servern."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Ingen registrerad epost adress för den användaren."
 
@@ -1438,7 +1681,7 @@ msgstr "Ingen begäran funnen!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Inget resultat"
 
@@ -1449,12 +1692,16 @@ msgstr "Ingen storlek"
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Ingen status hittad med det ID"
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Ingen status med det ID hittades."
 
@@ -1464,13 +1711,15 @@ msgid "No such OpenID."
 msgstr "Det existerar inget sådant OpenID"
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Inget sådant dokument."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Inget sådant inlägg."
 
@@ -1508,12 +1757,22 @@ msgstr "Ingen sådan prenumeration"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Ingen sådan användare"
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "Ingen användare med den emailadressen eller användarnamn."
 
@@ -1527,32 +1786,38 @@ msgid "Not a recovery code."
 msgstr "Det är ingen kod för återställning."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Inte registrerad användare."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Ingen support för det formatet."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Det är inget giltigt Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Det är inget giltigt OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Ingen giltig emailadress"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Det är ingen giltig epost adress."
 
@@ -1560,6 +1825,11 @@ msgstr "Det är ingen giltig epost adress."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Det är inget giltigt användarnamn."
 
@@ -1579,7 +1849,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Det är ingen giltig profil URL (ingen YADIS angiven)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Det verkar inte vara en bildfil, annars korrupt."
 
@@ -1590,11 +1861,13 @@ msgstr "Inte tillstånd ännu."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Väntade mig inte detta svar!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Hittades inte"
 
@@ -1610,11 +1883,15 @@ msgstr "Hittades inte"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Inte inloggad."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Ingen prenumerant!"
 
@@ -1631,39 +1908,44 @@ msgid "Notice feed for %s"
 msgstr "Inlägg flöde för %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Inlägget har ingen profil"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Inlägg"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Inlägg taggade med %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Gammalt lösenord"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "OpenID konto setup"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "OpenID skicka automatiskt"
 
@@ -1671,29 +1953,34 @@ msgstr "OpenID skicka automatiskt"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "OpenID inloggning"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "OpenID bekäftelse ångrad."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID bekräftelse misslyckad: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID misslyckades: %s"
@@ -1709,11 +1996,12 @@ msgid "OpenID settings"
 msgstr "OpenID inställningar"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Om du vill, skriv ett personligt meddelande med inbjudan."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Bitvis uppladdad."
 
@@ -1723,34 +2011,46 @@ msgstr "Bitvis uppladdad."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Lösenord"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Lösenord och bekräftelse matchar inte."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Lösenordet måste vara 6 tecken eller fler."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Förfrågan om återställning av lösenord"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Lösenord är sparat."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Lösenorden matchar inte."
 
@@ -1770,14 +2070,17 @@ msgid "People search"
 msgstr "Sökning personer"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Personlig"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Personligt meddelande"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
 
@@ -1792,7 +2095,7 @@ msgstr ""
 "prenumerera på någons inlägg, klicka på \"Cancel\""
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Posta ett inlägg när min Jabber/GTalk status ändras."
 
@@ -1801,7 +2104,9 @@ msgstr "Posta ett inlägg när min Jabber/GTalk status ändras."
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Inställningar"
 
@@ -1810,42 +2115,52 @@ msgstr "Inställningar"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Språkval"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Sekretesspolicy"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Det var ett problem när inlägget sparades."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profil"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "Profil URL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profil inställningar"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Okänd profil"
 
@@ -1854,17 +2169,19 @@ msgid "Public Stream Feed"
 msgstr "Publik ström"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Publik tidslinje"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicera ett MicroID för min Jabber/GTalk adress."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publicera ett MicroID för min emailadress."
 
@@ -1874,12 +2191,14 @@ msgid "Recent Tags"
 msgstr "Tidigare taggar"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Återställ"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Återställ lösenord"
 
@@ -1892,37 +2211,45 @@ msgstr "Kod för återställning av okänd användare."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrera"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Registrering är inte möjlig."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Registreringen är genomförd"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Avvisa"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Kom ihåg mig"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Fjärrprofil utan motsvarande profil"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Fjärrprenumerera"
 
@@ -1936,6 +2263,9 @@ msgstr "Fjärrprenumerera"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -1944,7 +2274,7 @@ msgstr "Ta bort"
 msgid "Remove OpenID"
 msgstr "Ta bort OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1953,34 +2283,41 @@ msgstr ""
 "bort den, lägg till en annan OpenID först."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Svar"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Svarat på %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Återställ"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Återställ lösenord"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "SMS Telefonnummer"
 
@@ -1989,17 +2326,18 @@ msgstr "SMS Telefonnummer"
 msgid "SMS Settings"
 msgstr "SMS Inställningar"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "SMS Bekräftelse"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Samma som lösenordet ovan"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Samma som lösenordet ovan. Måste fyllas i."
 
@@ -2012,12 +2350,21 @@ msgstr "Samma som lösenordet ovan. Måste fyllas i."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Spara"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Sök"
 
@@ -2027,7 +2374,7 @@ msgid "Search Stream Feed"
 msgstr "Sök strömflöde"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2036,7 +2383,7 @@ msgstr ""
 "Sök efter innehåll i inlägg på %%site.name%%. Skilj söktermerna åt med "
 "mellanslag; dom måste vara minst tre tecken långa."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2046,33 +2393,38 @@ msgstr ""
 "Skilj söktermerna åt med mellanslag; de måste vara minst tre tecken långa. "
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Välj en operatör"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Skicka"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Skicka email till denna adress för att posta ett nya inlägg."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Skicka meddelande till mig via email vid nya prenumerationer."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Skicka inlägg till mig via Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2081,17 +2433,20 @@ msgstr ""
 "debitera mig."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Skicka svar till mig via Jabber/GTalk från personer som inte jag "
 "prenumererar på."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Inställningar"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Inställningar sparade."
 
@@ -2111,27 +2466,32 @@ msgid "Something weird happened."
 msgstr "Någonting konstigt inträffade."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Ledsen, men inga inkommande email är tillåtna."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Ledsen, men det är inte din inkommande emailadress."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Källa"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Statistik"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Sparade OpenID kunde inte hittas."
 
@@ -2139,24 +2499,28 @@ msgstr "Sparade OpenID kunde inte hittas."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Prenumerera"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Prenumerant"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Prenumeration accepterad"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Prenumeration avvisad"
 
@@ -2164,28 +2528,35 @@ msgstr "Prenumeration avvisad"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Prenumerationer"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Systemfel när filen laddades upp."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Taggar"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Text"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Text sökning"
 
@@ -2205,6 +2576,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Den bekräftelsekoden är inte för dig!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Den emailadressen tillhör redan en annan användare."
 
@@ -2214,63 +2586,73 @@ msgid "That file is too big."
 msgstr "Filen är för stor."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Det är redan din Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Det är redan din emailadress."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Det är redan ditt telefonnummer."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Det är inte ditt Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Det är inte din emailadress."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Det är inte ditt telefonnummer."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Det är fel IM adress."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Det är fel nummer i bekräftelsen"
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Det numret tillhör en annan användare."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "För långt. Maximalt 140 tecken"
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Det är för långt. Max antal tecken är 255."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto."
@@ -2279,11 +2661,14 @@ msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "Adressen är borttagen."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2293,7 +2678,8 @@ msgstr ""
 "med sidans instruktioner hur du bekräftar en prenumeration. Din "
 "prenumerering token är:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2303,35 +2689,40 @@ msgstr ""
 "sidans instruktioner hur du avvisar en prenumeration."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Dessa personer är dom som lyssnar på %s inlägg."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Dessa personer är dom som lyssnar på dina inlägg."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Detta är personer och inlägg som %s lyssnar på."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Detta är personer och inlägg som du lyssnar på."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Dom personerna är redan registrerade användare och du blev nu automatiskt "
 "prenumerant till dom:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Denna bekräftelsekod är för gammal. Du får starta om på nytt igen."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2340,7 +2731,7 @@ msgstr ""
 "på skicka för att gå dit där du skapade ditt OpenID."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2355,6 +2746,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Denna metod kräver antingen skicka eller tabort."
 
@@ -2363,25 +2757,37 @@ msgstr "Denna metod kräver antingen skicka eller tabort."
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Denna metod kräver skicka."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Tidszon"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Du har inte valt tidszon"
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2394,18 +2800,21 @@ msgstr ""
 "nedan."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Två användarid eller namn måste läggas till."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL till din hemsida, blog eller profil på en annan sida."
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL till din profil på en annan kompatibel mikroblogg"
 
@@ -2417,15 +2826,22 @@ msgstr "URL till din profil på en annan kompatibel mikroblogg"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Oväntat utskick av formuläret."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Oväntad rensning av lösenord."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Okänd funktion"
 
@@ -2456,38 +2872,47 @@ msgstr "Lämnar pren."
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "OMB versionen stöds inte"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Bildfilens format stödjs inte."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Uppdateringar via SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Uppdateringar via instant messenger (IM)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Uppdateringar från %1$s och vänner på %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Uppdateringar från %1$s på %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Ladda upp"
 
@@ -2508,6 +2933,7 @@ msgid "Upload a new profile image"
 msgstr "Ladda upp en ny profilbild"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -2515,7 +2941,9 @@ msgstr ""
 "sida."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Används endast för uppdateringar, annonsering och återställning av lösenord"
@@ -2540,11 +2968,16 @@ msgstr "Användaren som avlyssnas existerar inte."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Användaren har ingen profil."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Användarens smeknamn"
 
@@ -2553,29 +2986,33 @@ msgid "User not found."
 msgstr "Användare hittades inte."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "Vilken tidszon befinner du dig normalt?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Vad är på gång, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Fel filtyp för bild '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Fel bildstorlek för '%s'"
@@ -2583,7 +3020,9 @@ msgstr "Fel bildstorlek för '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Ja"
 
@@ -2606,11 +3045,12 @@ msgid "You are already logged in!"
 msgstr "Du är redan inloggad!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Du prenumererar redan på dessa användare:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "Du är inte vän med den användaren."
 
@@ -2628,7 +3068,7 @@ msgstr "Du kan skapa ett nytt konto och börja skriva inlägg."
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan ta emot SMS meddelande via email från %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
@@ -2637,6 +3077,7 @@ msgstr ""
 "\"Remove\""
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2645,7 +3086,8 @@ msgstr ""
 "Du kan skicka och ta emot inlägg genom Jabber/GTalk [instant messages](%%doc."
 "im%%). Konfigurera din adress och inställningar nedan. "
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2655,21 +3097,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Du kan använda lokala prenumerationer!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Du kan inte registrera dig om du inte godkänner licensvillkor."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Du skickade inte oss den profilen"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2691,16 +3135,19 @@ msgstr ""
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Du kan inte tabort nån annan användares status."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2708,20 +3155,21 @@ msgstr ""
 "du kommer bli meddelad när någon du bjudit in accepterar inbjudan och "
 "registrerar sig. Tack för att du hjälper oss växa!"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Du är identifierad. Skriv ett nytt lösenord nedan."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "Din OpenID URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Ditt användarnamn på denna server eller registrerad epost adress."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2730,47 +3178,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) låter dig logga in på flera sidor med samma konto. "
 "Ställ in ditt OpenID konto härifrån."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "ett par sekunder sedan"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "för %d dagar sedan"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "för %d timmar sedan"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "för %d minuter sedan"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "för %d månader sedan"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "för en dag sedan"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "för nån minut sedan"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "för en månad sedan"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "för ett år sedan"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "för en timma sedan"
 
@@ -2792,19 +3250,20 @@ msgid "reply"
 msgstr "svar"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "samma som lösenordet ovan"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "okänd fil typ"
 
 #: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
 msgid "« After"
-msgstr "« Nyare"
+msgstr "Efter"
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
@@ -2819,6 +3278,26 @@ msgstr "« Nyare"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Det var något problem med din session. Försök igen, tack."
 
@@ -2827,6 +3306,7 @@ msgid "This notice is not a favorite!"
 msgstr "Det inlägget är ingen favorit!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "Kunde inte tabort favoriten."
 
@@ -2834,22 +3314,28 @@ msgstr "Kunde inte tabort favoriten."
 msgid "Favor"
 msgstr "Favorisera"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Skicka mig ett email när någon lägger till mitt inlägg som favorit."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Skicka mig ett email när någon sänder ett privat meddelande."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Detta inlägg är redan en favorit!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Kunde inte skapa favorit."
 
@@ -2859,11 +3345,13 @@ msgstr "Avfavorisera"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s favoriter"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Feed över %s favoriter"
@@ -2905,33 +3393,44 @@ msgid "Login with your username and password. "
 msgstr "Logga in med ditt användarnamn och lösenord."
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Det är för långt. Max är 140 tecken. "
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Ingen mottagare tillagd."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Du kan inte skicka meddelande till den användaren."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Skicka inte meddelande till dig själv, viska lite tyst istället."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "Ingen sådan användare"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nytt meddelande"
 
@@ -2986,6 +3485,11 @@ msgstr "Du kan uppdatera din personliga profil här"
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Användare utan matchande profil"
 
@@ -3014,6 +3518,8 @@ msgid "New password successfully saved. "
 msgstr "Nya lösenordet är sparat."
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Lösenordet måste vara minst 6 tecken."
 
@@ -3035,12 +3541,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "För att prenumerera så kan du [login](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Feed för %s favoriter"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Kunde inte ta emot favoritinläggen."
 
@@ -3048,7 +3557,7 @@ msgstr "Kunde inte ta emot favoritinläggen."
 msgid "No such message."
 msgstr "Inget sådant meddelande."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Endast den som skickat och mottagaren kan läsa detta meddelande."
 
@@ -3072,52 +3581,71 @@ msgid "Mobile carrier for your phone. "
 msgstr "Mobiloperatören för din telefon."
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direktmeddelande till %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alla direktmeddelanden skickade till %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Direktmeddelanden du skickat"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Alla direktmeddelanden skickade ifrån %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Ingen meddelande text!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Mottagaren kunde inte hittas."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Kan inte skicka direktmeddelanden till användare som inte är dina vänner."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoriter från %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s uppdaterade favoriter av %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s la till ditt inlägg som favorit"
@@ -3140,14 +3668,17 @@ msgstr ""
 "Twitter,"
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Twitter inställningar"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Twitter konto"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Verifierat Twitter konto."
 
@@ -3156,6 +3687,7 @@ msgid "Twitter Username"
 msgstr "Twitter användarnamn"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Inga mellanslag tack."
 
@@ -3164,18 +3696,22 @@ msgid "Twitter Password"
 msgstr "Twitter lösenord"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Skicka automatiskt mina inlägg till Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Skicka lokala \"@\" svar till Twitter."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Prenumerera på mina Twitter vänner här."
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3184,6 +3720,7 @@ msgstr ""
 "underscore(_). 15 tecken max."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "Kunde inte verifiera din Twitter!"
 
@@ -3194,61 +3731,72 @@ msgstr "Kunde inte mottaga konto information för \"%s\" Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "Kunde inte spara dina Twitter inställningar!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Twitter inställningar sparade."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Det är inte ditt Twitter konto."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "Kunde inte tabort Twitter användaren."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Twitterkontot borttaget."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "Kunde inte spara Twitter inställningar."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
-msgstr ""
+msgstr "Twitterinställningar sparade."
 
 #: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
-msgstr ""
+msgstr "Vänligen kontrollera dessa uppgifter för att försäkra dig om "
 
 #: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
-msgstr ""
+msgstr "Abonnemanget har godkänts, men ingen "
 
 #: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
-msgstr ""
+msgstr "Abonnemanget har nekats, men ingen "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3258,89 +3806,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt namn: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Plats: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hemsida: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3348,11 +3918,11 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3367,7 +3937,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -3379,7 +3949,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3388,31 +3958,39 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr ""
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr ""
 
@@ -3425,40 +4003,54 @@ msgid "Twitter integration options"
 msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s med vänner"
 
 #: actions/avatarsettings.php:76
-#, fuzzy
 msgid "You can upload your personal avatar."
-msgstr "Du kan uppdatera din personliga profil här"
+msgstr "Du kan ladda upp din profilbild."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "Twitter inställningar"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
@@ -3476,38 +4068,47 @@ msgid "There was a problem with your session token. "
 msgstr "Det var något problem med din session. Försök igen, tack."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "Inget sådant inlägg."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 #, fuzzy
 msgid "Unknown file type"
 msgstr "okänd fil typ"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 #, fuzzy
 msgid "No profile specified."
 msgstr "Ingen mottagare tillagd."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 #, fuzzy
 msgid "No profile with that ID."
 msgstr "Ingen status hittad med det ID"
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "Ingen sådan användare"
@@ -3517,12 +4118,12 @@ msgstr "Ingen sådan användare"
 msgid "Are you sure you want to block this user? "
 msgstr "Är du säker på att du vill tabort detta inlägg?"
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 #, fuzzy
 msgid "You have already blocked this user."
 msgstr "Du prenumererar redan på dessa användare:"
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3543,42 +4144,60 @@ msgstr ""
 msgid "Add to favorites"
 msgstr "Feed för %s favoriter"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 #, fuzzy
 msgid "You must be logged in to create a group."
 msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "Inget användarnamn"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "Ingen sådan användare"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 #, fuzzy
 msgid "You must be an admin to edit the group"
 msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3589,16 +4208,17 @@ msgstr ""
 "Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "Biografin är för lång (max 140 tecken)"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "Kunde inte uppdatera användare."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 #, fuzzy
 msgid "Options saved."
 msgstr "Inställningar sparade."
@@ -3618,7 +4238,8 @@ msgstr "Ny emailadress för att skicka till %s"
 msgid "Send me email when someone "
 msgstr "Skicka mig ett email när någon sänder ett privat meddelande."
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3634,7 +4255,7 @@ msgstr ""
 "En bekräftelsekod har skickats till den IM-adress som du angav. Du måste "
 "godkänna att %s får skicka meddelanden till dig."
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3648,55 +4269,70 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "Inget innehåll!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 #, fuzzy
 msgid "After"
 msgstr "« Nyare"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "Tidigare »"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 #, fuzzy
 msgid "Invitations have been sent to the following users:"
 msgstr "Inbjudan(ar) är skickade till följande personer:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, fuzzy, php-format
 msgid "You have been invited to %s"
 msgstr "Du är identifierad. Skriv in"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "Flöden för $s vänner"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3745,13 +4381,15 @@ msgstr ""
 msgid "Sync preferences"
 msgstr "Inställningar"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 #, fuzzy
 msgid "Disfavor favorite"
 msgstr "Avfavorisera"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "Inget sådant inlägg."
@@ -3767,7 +4405,8 @@ msgid "The most popular notices on the site right now."
 msgstr "Visar dom populäraste taggarna ifrån den senaste veckan."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3781,15 +4420,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr ""
 
@@ -3797,12 +4438,14 @@ msgstr ""
 msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "Användarbilden uppdaterad."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "Uppdatering av profilbild misslyckades."
@@ -3822,7 +4465,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
@@ -3837,6 +4481,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "Skapa ett nytt konto"
@@ -3848,7 +4493,7 @@ msgid ""
 msgstr ""
 "Sök efter personer på %%site.name%% efter deras namn, plats eller intressen."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "Sökning personer"
@@ -3873,22 +4518,22 @@ msgstr "Skicka inlägg till mig via Jabber/GTalk."
 msgid "A confirmation code was sent "
 msgstr "Ingen bekräftelsekod."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 #, fuzzy
 msgid "You must be logged in to join a group."
 msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Du prenumererar redan på dessa användare:"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, fuzzy, php-format
 msgid "%s joined group %s"
 msgstr "%s / Favoriter från %s"
@@ -3897,17 +4542,20 @@ msgstr "%s / Favoriter från %s"
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 #, fuzzy
 msgid "You must be logged in to leave a group."
 msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "Inget sådant meddelande."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "Du skickade inte oss den profilen"
@@ -3917,22 +4565,26 @@ msgstr "Du skickade inte oss den profilen"
 msgid "You may not leave a group while you are its administrator."
 msgstr "Du kan inte tabort nån annan användares status."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 #, fuzzy
 msgid "Could not find membership record."
 msgstr "Kunde inte uppdatera användarens inställningar."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -3944,16 +4596,18 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "Kunde inte skapa favorit."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Kunde inte skapa prenumeration."
@@ -3968,12 +4622,15 @@ msgstr "Filen är för stor."
 msgid "Don't send a message to yourself; "
 msgstr "Du kan inte skicka meddelande till den användaren."
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 #, fuzzy
 msgid "Notice posted"
 msgstr "Inlägg"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr ""
 
@@ -3990,7 +4647,7 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "OpenID inloggning"
@@ -4018,11 +4675,13 @@ msgstr ""
 msgid "Service"
 msgstr "Sök"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Språket är för långt(max 50 tecken)."
@@ -4032,17 +4691,18 @@ msgstr "Språket är för långt(max 50 tecken)."
 msgid "Change your password."
 msgstr "Ändra ditt lösenord"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "Lösenord är sparat."
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Ingen giltig emailadress"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -4052,12 +4712,13 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "Okänd profil"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4070,21 +4731,26 @@ msgstr ""
 "mänsklig användare) "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ogiltig hemsideadress '%s'"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "Kunde inte spara profil."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "Publik tidslinje"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "Kunde inte ta emot favoritinläggen."
@@ -4106,11 +4772,13 @@ msgstr "Publik ström"
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4171,7 +4839,8 @@ msgstr "(Du kommer inom kort få ett email med"
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "Svarat på %s"
@@ -4181,53 +4850,74 @@ msgstr "Svarat på %s"
 msgid "%s favorite notices, page %d"
 msgstr "%s favoriter"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "Inget sådant inlägg."
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "Inlägg"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "Inlägg flöde för %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "Medlem sedan"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr ""
 
@@ -4243,7 +4933,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr "Endast den som skickat och mottagaren kan läsa detta meddelande."
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "Inbox för %s - sida %d"
@@ -4254,35 +4944,42 @@ msgid "'s profile"
 msgstr "Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "Användaren har ingen profil."
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 #, fuzzy
 msgid "User actions"
 msgstr "Okänd funktion"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 #, fuzzy
 msgid "Send a direct message to this user"
 msgstr "Du kan inte skicka meddelande till den användaren."
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 #, fuzzy
 msgid "Message"
 msgstr "Nytt meddelande"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "Prenumerant"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr ""
 
@@ -4308,7 +5005,7 @@ msgstr "Skicka inlägg till mig via Jabber/GTalk."
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Väntar bekräftelse på detta telefonnummer. "
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Välj en operatör"
@@ -4373,17 +5070,18 @@ msgstr "Detta är personer och inlägg som %s lyssnar på."
 msgid "These are the people whose "
 msgstr "Dessa personer är dom som lyssnar på %s inlägg."
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "Inget Jabber ID."
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Inlägg taggade med %s"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4408,7 +5106,7 @@ msgstr "Taggar"
 msgid "Tag user"
 msgstr "Taggar"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4419,17 +5117,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "Det var något problem med din session. Försök igen, tack."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "Kunde inte spara informationen om användarbild"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4438,20 +5136,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "Inget sådant meddelande."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "Inlägg taggade med %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "Hittades inte"
@@ -4463,17 +5164,18 @@ msgstr ""
 "Lägg till ditt Twitter konto för att automatiskt skicka dina inlägg till "
 "Twitter,"
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 #, fuzzy
 msgid "Twitter user name"
 msgstr "Twitter användarnamn"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 #, fuzzy
 msgid "Twitter password"
 msgstr "Twitter lösenord"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 #, fuzzy
 msgid "Twitter Friends"
 msgstr "Twitter inställningar"
@@ -4487,158 +5189,167 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr "Kunde inte mottaga konto information för \"%s\" Twitter."
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "Fel uppstog när användaren skulle sparas."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "Ingen profil URL lämnades ut av servern."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 #, fuzzy
 msgid "No profile with that id."
 msgstr "Ingen status hittad med det ID"
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Lämnar pren."
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr ""
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Det var ett problem när inlägget sparades."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 #, fuzzy
 msgid "Upload an avatar"
 msgstr "Uppdatering av profilbild misslyckades."
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr ""
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s(%s)"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Account"
 msgstr "Om"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "Ändra ditt lösenord"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "Skapa ett nytt konto"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "Det existerar inget sådant OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "Hjälp"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "Nytt inlägg"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "Nytt inlägg"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Prenumerationer"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "Ingen sådan användare"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr ""
 
@@ -4652,12 +5363,15 @@ msgstr "%s favoriter"
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "Skapa ett nytt konto"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 #, fuzzy
 msgid "Published"
 msgstr "Publik"
@@ -4680,35 +5394,40 @@ msgstr "Feed för taggar %s"
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 #, fuzzy
 msgid "Tag"
 msgstr "Taggar"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL till din hemsida, blog eller profil på en annan sida."
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
 msgstr "Prenumerationer"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4718,21 +5437,21 @@ msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 #, fuzzy
 msgid "Logo"
 msgstr "Logga ut"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
@@ -4765,12 +5484,12 @@ msgstr "Logga in"
 msgid "Leave"
 msgstr "Spara"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Logga in med ditt användarnamn och lösenord."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Skapa ett nytt konto"
@@ -4791,24 +5510,24 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s lyssnar nu på dina meddelanden i %2$s."
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "Plats: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Hemsida: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, fuzzy, php-format
 msgid "You've been nudged by %s"
 msgstr "Du är identifierad. Skriv in"
@@ -4823,47 +5542,55 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s la just in ditt inlägg ifrån %2$s som en av deras favorit."
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 #, fuzzy
 msgid "From"
 msgstr "från"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "Tabort inlägg"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "Skicka ett meddelande"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "Minst 6 tecken"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 #, fuzzy
 msgid "in reply to"
 msgstr "svar till..."
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Svara på detta inlägg"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "svar"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Ta bort inlägg"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete"
 msgstr "Ta bort"
@@ -4886,28 +5613,30 @@ msgstr "Du kan inte skicka meddelande till den användaren."
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Publik"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 #, fuzzy
 msgid "Recent tags"
 msgstr "Tidigare taggar"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "Personer"
@@ -4926,34 +5655,36 @@ msgstr "Sök personer på denna sida"
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Fjärrprenumerera"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Fjärrprenumerera"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 "Använd detta formulär för att bjuda in dina vänner och kollegor till denna "
 "sida."
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Användaren har ingen profil."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "Prenumerera på mina Twitter vänner här."
@@ -4968,11 +5699,12 @@ msgid "Top posters"
 msgstr ""
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 #, fuzzy
 msgid "Unblock this user"
 msgstr "Ingen sådan användare"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr ""
 
@@ -4980,38 +5712,2039 @@ msgstr ""
 msgid "Unsubscribe from this user"
 msgstr ""
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Flöden för $s vänner"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Flöden för $s vänner"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Flöden för $s vänner"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s med vänner"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Du kan uppdatera din personliga profil här"
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Användarbilden uppdaterad."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Du håller på att tabort inlägget permanent. När det väl är gjort kan du inte "
+"Ã¥ngra dig."
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Det var något problem med din session. Försök igen, tack."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Skicka mig ett email när någon sänder ett privat meddelande."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Mikroblogg av %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Sök efter personer på %%site.name%% efter deras namn, plats eller intressen. "
+"Skilj söktermerna åt med mellanslag; de måste vara minst tre tecken långa. "
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Sök i strömmen efter \"%s\""
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Av säkerhetsskäl, var vänlig skriv in ditt användarnamn och lösenord innan "
+"du ändrar dina inställningar."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Publik ström"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Publik ström"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Publik ström"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"förutom det här, som är privat: lösenord, epostadress, IM-adress, "
+"telefonnummer."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Skapa"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
 #, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "Kunde inte tabort favoriten."
+msgid "Your profile"
+msgstr "Inget sådant inlägg."
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "Profil"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Inlägg flöde för %s"
 
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Outbox för %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Skapa ett nytt konto"
+msgid "Edit Avatar"
+msgstr "Användarbild"
 
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
 #, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Kunde inte radera epost bekräftelsen."
+msgid "Edit profile settings"
+msgstr "Profil inställningar"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
 
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Är du säker på att du vill tabort detta inlägg?"
+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 ""
+"En bekräftelsekod har skickats ut till telefonnumret du fyllde i. "
+"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
+"använder den."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Ingen sådan användare"
 
+#: actions/twittersettings.php:72
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Sök innehåll i inlägg"
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Lägg till ditt Twitter konto för att automatiskt skicka dina inlägg till "
+"Twitter,"
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Kunde inte mottaga konto information för \"%s\" Twitter."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"Kontrollera dessa detajer noga så att du verkligen vet att du vill "
+"prenumerera på denna användares inlägg. Om du inte frågade efter att "
+"prenumerera på någons inlägg, klicka på \"Cancel\""
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Kunde inte bekräfta epost"
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
 
-#~ msgid "Email address"
-#~ msgstr "Epostadress"
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Fel uppstog när inlägget skulle läggas till"
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"Om du redan har ett konto, logga in med ditt användarnamn och lösenord för "
+"att koppla det till ditt OpenID"
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "Om du har förlorat eller glömt bort ditt lösenord så kan du få ett nytt "
-#~ "skickat till din epost, kopplat till ditt konto."
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s lyssnar nu på dina meddelanden i %1$s.\n"
+"\n"
+"\tHälsningar,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Sök"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Inget sådant dokument."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Ingen sådan användare"
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Användaren har ingen profil."
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s med vänner"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Ingen sådan användare"
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Bekräftelsekod"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Kan inte ta bort detta inlägg."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ogiltig hemsideadress '%s'"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Användarnamnet används redan, försök med ett annat."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Kunde inte skapa favorit."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nytt inlägg"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nytt inlägg"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Det är inget giltigt användarnamn."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Ingen mottagare tillagd."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Användaren har ingen profil."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Du skickade inte oss den profilen"
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Ingen sådan användare"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Kunde inte uppdatera användare."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Kunde inte spara dina Twitter inställningar!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Inställningar sparade."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Inget resultat"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Användaren har ingen profil."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Nytt meddelande"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Kunde inte spara profil."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) låter dig logga in på flera sidor med samma konto. "
+"Ställ in ditt OpenID konto härifrån."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profil inställningar"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Om du glömt eller tappat bort ditt lösenord så kan du få ett nytt skickat "
+"till den emailadress du sparat till ditt konto."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Du är identifierad. Skriv ett nytt lösenord nedan."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Förfrågan om återställning av lösenord"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Fel uppstog med bekräftelsekoden."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Prenumerera på mina Twitter vänner här."
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s favoriter"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Ingen sådan användare"
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Inlägg taggade med %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s lyssnar nu på dina meddelanden i %2$s."
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Detta inlägg är redan en favorit!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Det inlägget är ingen favorit!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Kunde inte ta emot favoritinläggen."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "Ingen mottagare tillagd."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Kunde inte få fram status."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Uppdateringar med svar till %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Uppdateringar från %1$s på %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Alla prenumerationer"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profil inställningar"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Du skickade inte oss den profilen"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Det var ett problem när inlägget sparades."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Meddelande till %1$s på %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Användaren har ingen profil."
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profil"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Ladda upp"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Ändra ditt lösenord"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Anslut"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Sök"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Logga in"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Ingen sådan användare"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Ingen sådan användare"
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Inget innehåll!"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Sök"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Hemsidan har ingen giltig URL"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Inget sådant meddelande."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Direktmeddelande till %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Det är för långt. Max är 140 tecken. "
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Biografin är för lång (max 140 tecken)"
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Du prenumererar redan på dessa användare:"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Du skickade inte oss den profilen"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s / Favoriter från %s"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Du skickade inte oss den profilen"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Sök personer på denna sida"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Användarbilden uppdaterad."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "För långt. Maximalt 140 tecken"
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Bildfilens format stödjs inte."
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Biografin är för lång (max 140 tecken)"
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Uppdateringar från %1$s på %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Användaren som avlyssnas existerar inte."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Inte tillstånd ännu."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Kunde inte konvertera förfrågan tokens till Access tokens."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Okänd version av OMB protokollet."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Inget sådant inlägg."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Inget sådant inlägg."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Uppdateringar från %1$s på %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn ännu? "
+"[Registrera](%%action.register%%) ett nytt konto, eller testa [OpenID](%%"
+"action.openidlogin%%)."
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Uppdateringar från %1$s på %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Alla uppdateringar som matchar söksträngen \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Anslut"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Biografin är för lång (max 140 tecken)"
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Det är ingen giltig profil URL (ingen YADIS angiven)."
+
+#: 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 "Kunde inte få en förfrågan token."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Meddelande till %1$s på %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Flöden för $s vänner"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Flöden för $s vänner"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Flöden för $s vänner"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Outbox för %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Inlägg"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Kontrollera dessa detajer noga så att du verkligen vet att du vill "
+"prenumerera på denna användares inlägg. Om du inte frågade efter att "
+"prenumerera på någons inlägg, klicka på \"Cancel\""
+
+#: actions/userauthorization.php:249
+#, 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 ""
+"Prenumerationen har blivit bekräftad, men ingen URL har gått igenom. Kolla "
+"med sidans instruktioner hur du bekräftar en prenumeration. Din "
+"prenumerering token är:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Prenumerationen har blivit avvisad, men inga URL har gått igenom. Kolla med "
+"sidans instruktioner hur du avvisar en prenumeration."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Kan inte läsa användarbild URL '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Fel filtyp för bild '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Kunde inte skicka vidare till servern: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Sök innehåll i inlägg"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Kunde inte uppdatera användaren med bekräftad emailadress."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Svara på detta inlägg"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Det var ett problem när inlägget sparades."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Ingen bekräftelsekod."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Välj en operatör"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Nytt inlägg"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s la till ditt inlägg som favorit"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "från"
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Kunde inte ta emot favoritinläggen."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Tabort inlägg"
diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo
index 5cfa0c3fb..034e68322 100644
--- a/locale/te/LC_MESSAGES/statusnet.mo
+++ b/locale/te/LC_MESSAGES/statusnet.mo
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 4576f3613..6ff6d95b6 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -1,37 +1,30 @@
-# #-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#
-# StatusNet Telugu Translation
-# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the StatusNet package.
-# Veeven <veeven@gmail.com>, 2008.
-#
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Telugu
 #
+# Author@translatewiki.net: Veeven
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-04-18 06:18+0000\n"
-"Last-Translator: Veeven <veeven@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:36+0000\n"
+"Language-Team: Telugu\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: te\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "\"%s\"కై అన�వేషణ వాహిని"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr "ఈ అంతరంగిక భోగట�టా తప�ప: సంకేతపదం, ఈమెయిల� చిర�నామా, IM చిర�నామా, ఫోన� నంబర�."
@@ -42,17 +35,19 @@ msgid " from "
 msgstr " న�ండి "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -84,6 +79,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
@@ -100,25 +96,28 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s ప�రజా వాహిని"
@@ -128,40 +127,55 @@ msgstr "%s ప�రజా వాహిని"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s మరియ� మిత�ర�ల�"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
-msgstr ""
+msgstr "%s బహిరంగ కాలరేఖ"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s స�థితి"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s కాలరేఖ"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -170,7 +184,8 @@ msgstr ""
 "[%%site.broughtby%%](%%site.broughtbyurl%%) వార� అందిస�త�న�న ఈ **%%site.name%%** "
 "అనేది మైక�రో బ�లాగింగ� సద�పాయం."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** అనేది మైక�రో బ�లాగింగ� సద�పాయం."
@@ -182,30 +197,34 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 చిన�నబడి అక�షరాల� లేదా అంకెల�, విరామచిహ�నాల� మరియ� ఖాళీల� తప�ప"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 లేదా అంతకంటే ఎక�క�వ అక�షరాల�"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 లేదా అంతకంటే ఎక�క�వ అక�షరాల�, మర�చిపోకండి!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
-msgstr ""
+msgstr "6 లేదా అంతకంటే ఎక�క�వ అక�షరాల�. తప�పనిసరి."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -213,6 +232,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -242,7 +262,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
@@ -265,16 +312,23 @@ msgstr ""
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "గ�రించి"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "అంగీకరించ�"
 
@@ -285,6 +339,9 @@ msgstr "అంగీకరించ�"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "చేర�చ�"
 
@@ -302,27 +359,29 @@ msgstr ""
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "చిర�నామా"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "అన�ని చందాల�"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "%s కోసం అన�ని తాజాకరణలూ"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "\"%s\"తో సరిపోలే అన�ని తాజాకరణల�"
@@ -332,30 +391,37 @@ msgstr "\"%s\"తో సరిపోలే అన�ని తాజాకరణ
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "ఇప�పటికే లోనికి ప�రవేశించార�."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "ఇప�పటికే చేరార�!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "మీర� నిజంగానే ఈ నోటీస�ని తొలగించాలన�క�ంట�న�నారా?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr ""
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "భవిష�యత�త�లో ఆటోమెటిగ�గా లోనికి ప�రవేశించ�; బయటి కంప�యూర�ల కొరక� కాద�!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -363,15 +429,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "అవతారం"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "అవతారాన�ని తాజాకరించాం."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -379,24 +449,26 @@ msgid ""
 msgstr ""
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
 msgid "Before »"
 msgstr "ఇంతక�రితం »"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "స�వపరిచయం"
 
@@ -404,16 +476,18 @@ msgstr "స�వపరిచయం"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "స�వపరిచయం చాలా పెద�దగా ఉంది (140 అక�షరాల� గరిష�ఠం)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "ఈ నోటీస�ని తొలగించలేమ�."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr ""
@@ -421,6 +495,8 @@ msgstr ""
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "కొత�త సంకేతపదాన�ని భద�రపరచలేమ�."
 
@@ -428,31 +504,34 @@ msgstr "కొతà±�à°¤ సంకేతపదానà±�ని à°­à°¦à±�రపరà
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "రద�ద�చేయి"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr ""
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "మార�చ�"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr ""
 
@@ -462,11 +541,12 @@ msgid "Change password"
 msgstr "సంకేతపదం మార�చ�కోండి"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr ""
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr ""
 
@@ -476,6 +556,9 @@ msgstr ""
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "నిర�థారించ�"
 
@@ -488,12 +571,14 @@ msgstr "చిర�నామాని నిర�ధారించ�"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "నిర�ధారణ రద�దయింది."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr ""
 
@@ -502,7 +587,8 @@ msgstr ""
 msgid "Confirmation code not found."
 msgstr "నిర�ధారణ సంకేతం కనబడలేద�."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -522,20 +608,24 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "అన�సంధానించ�"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "ఇప�పటికే ఉన�న ఖాతాతో అన�సంధానించండి"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "సంప�రదించ�"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "ఓపెన��డీ ఫారమ�న� సృష�టించలేకపోయాం: %s"
@@ -543,35 +633,39 @@ msgstr "ఓపెనà±�à°�à°¡à±€ ఫారమà±�à°¨à±� సృషà±�à°Ÿà°¿à°‚à°šà
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr ""
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr ""
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "అవతారప� సమాచారాన�ని భద�రపరచలేక�న�నాం"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "కొత�త ప�రొఫైల� సమాచారాన�ని భద�రపరచలేక�న�నాం"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr ""
 
@@ -591,15 +685,17 @@ msgstr ""
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "ఈమెయిల� నిర�ధారణని తొలగించలేక�న�నాం."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "చందాని తొలగించలేకపోయాం."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr ""
 
@@ -612,29 +708,38 @@ msgstr ""
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "నిర�ధారణ సంకేతాన�ని చేర�చలేకపోయాం."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr ""
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "ప�రొఫైల�ని భద�రపరచలేక�న�నాం."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -650,42 +755,48 @@ msgstr ""
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "సృష�టించ�"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "ఈ పేర�తో కొత�త వాడ�కరిని సృష�టించ�"
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "కొత�త ఖాతా సృష�టించ�కోండి"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ప�రస�త�తం నిర�ధారించిన Jabber/GTalk చిర�నామా"
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -694,23 +805,27 @@ msgid "Currently"
 msgstr "ప�రస�త�తం"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr ""
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "మీ గ�రించి మరియ� మీ ఆసక�త�ల గ�రించి 140 అక�షరాల�లో చెప�పండి"
 
@@ -718,11 +833,13 @@ msgstr "మీ à°—à±�à°°à°¿à°‚à°šà°¿ మరియà±� మీ ఆసకà±�à°¤à±�à°
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "ఈమెయిల�"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "ఈమెయిల� చిర�నామా"
 
@@ -732,39 +849,43 @@ msgid "Email Settings"
 msgstr "ఈమెయిల� అమరికల�"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "ఈమెయిల� చిర�నామా ఇప�పటికే ఉంది."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "ఈమెయిల� చిర�నామా నిర�ధారణ"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ఈమెయిల� చిర�నామా, \"username@example.org\" వలె"
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr ""
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "పేర� లేదా ఈమెయిల� చిర�నామా ఇవ�వండి."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "వాడ�కరిని ఓపెన��డీకి అన�సంధానించటంలో పొరపాట�."
 
@@ -775,40 +896,47 @@ msgstr "వాడà±�కరిని à°…à°¨à±�సంధానించడంలà±
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 #, fuzzy
 msgid "Error inserting avatar"
 msgstr "అవతారాన�ని పెట�టడంలో పొరపాట�"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "కొత�త ప�రొపైల�ని చేర�చటంలో పొరపాట�"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "దూరప� ప�రొపైల�ని చేర�చటంలో పొరపాట�"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "చిర�నామా నిర�ధారణని భద�రపరచడంలో పొరపాట�."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "దూరప� ప�రొఫైల�ని భద�రపరచడంలో పొరపాట�"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "ప�రొఫైల�ని భద�రపరచడంలో పొరపాట�."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "వాడ�కరిని భద�రపరచడంలో పొరపాట�."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "వాడ�కరిని భద�రపరచడంలో పొరపాట�: సరికాద�."
 
@@ -817,6 +945,9 @@ msgstr "వాడà±�కరిని à°­à°¦à±�రపరచడంలో పొరà
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr ""
 
@@ -827,6 +958,7 @@ msgstr "à°ªà±�రొపైలà±�ని తాజాకరించటంలో à
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "దూరప� ప�రొపైల�ని తాజాకరించటంలో పొరపాట�"
 
@@ -836,34 +968,37 @@ msgid "Error with confirmation code."
 msgstr "నిర�ధారణ సంకేతంలో పొరపాట�."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "ప�రస�త�త పేర�"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 #, fuzzy
 msgid "FAQ"
 msgstr "తవసం"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "అవతారప� తాజాకరణ విఫలమైంది."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "%s యొక�క మిత�ర�ల ఫీడ�"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "%sకి వచ�చిన స�పందనల ఫీడ�"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
@@ -878,7 +1013,7 @@ msgstr ""
 msgid "Find people on this site"
 msgstr ""
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -890,6 +1025,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "పూర�తి పేర�"
 
@@ -898,24 +1038,33 @@ msgstr "పూర�తి పేర�"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "పూర�తి పేర� చాలా పెద�దగా ఉంది (గరిష�ఠంగా 255 అక�షరాల�)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "సహాయం"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-#, fuzzy
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
-msgstr "వాకిలి"
+msgstr "మ�ంగిలి"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 #, fuzzy
 msgid "Homepage"
 msgstr "హోమ� పేజీ"
@@ -924,21 +1073,27 @@ msgstr "హోమ� పేజీ"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "హోమ� పేజీ URL సరైనది కాద�."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr ""
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr ""
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM చిర�నామా"
 
@@ -948,7 +1103,7 @@ msgid "IM Settings"
 msgstr "IM అమరికల�"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -956,13 +1111,13 @@ msgstr ""
 "మీక� ఇప�పటికే ఖాతా ఉంటే, మీ వాడ�కరిపేర� మరియ� సంకేతపదంతో లోనికి ప�రవేశించి మీ ఓపెన��డీని మీ ఖాతాకి "
 "జతచేస�కోండి."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -971,55 +1126,62 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "పాత సంకేతపదం తప�ప�"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "వాడ�కరిపేర� లేదా సంకేతపదం తప�ప�."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "మీ సంకేతపదాన�ని తిరిగి పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల� చిర�నామాకి పంపించాం."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "'%s' అనే అవతారప� URL తప�ప�"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "'%s' అనే హోమ� పేజీ సరైనదికాద�"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "తప�ప�డ� లైసెన�స� URL '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "సందేశప� విషయం సరైనది కాద�"
 
@@ -1034,13 +1196,13 @@ msgid "Invalid notice url"
 msgstr "సందేశప� URL తప�ప�"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "ప�రొపైల� URL '%s' తప�ప�."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "ప�రొపైల� URL తప�ప� (చెడ� ఫార�మాట�)"
 
@@ -1058,28 +1220,35 @@ msgstr "తప�ప�డ� పరిమాణం."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "వాడ�కరిపేర� లేదా సంకేతపదం తప�ప�."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "ఆహ�వానించ�"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1088,11 +1257,12 @@ msgid ""
 msgstr ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ఇప�పటికే వేరొకరికి ఉంది."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1100,12 +1270,14 @@ msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "భాష"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
@@ -1114,7 +1286,15 @@ msgstr ""
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "ప�రాంతం"
 
@@ -1123,7 +1303,12 @@ msgstr "ప�రాంతం"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "ప�రాంతం పేర� మరీ పెద�దగా ఉంది (255 అక�షరాల� గరిష�ఠం)."
 
@@ -1132,18 +1317,22 @@ msgstr "à°ªà±�రాంతం పేరà±� మరీ పెదà±�దగా à°‰à°
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "ప�రవేశించండి"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "[ఓపెన��డీ](%%doc.openid%%) ఖాతాతో ప�రవేశించండి."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1151,22 +1340,26 @@ msgid ""
 "%). "
 msgstr ""
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "నిష�క�రమించ�"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "మీ సంకేతపదం మర�చిపోయారా?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -1177,16 +1370,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "సభ�య�లైన తేదీ"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, fuzzy, php-format
 msgid "Microblog by %s"
 msgstr "%s యొక�క మైక�రోబ�లాగ�"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1196,42 +1391,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr ""
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "కొత�త పేర�"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "కొత�త సందేశం"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "కొత�త సంకేతపదం"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "మీ కొత�త సంకేతపదం భద�రమైంది. మీర� ఇప�ప�డ� లోనికి ప�రవేశించార�."
 
@@ -1241,7 +1444,13 @@ msgstr "మీ కొత�త సంకేతపదం భద�రమైంద
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "పేర�"
 
@@ -1250,7 +1459,12 @@ msgstr "పేర�"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "ఆ పేర�ని ఇప�పటికే వాడ�త�న�నార�. మరోటి ప�రయత�నించండి."
 
@@ -1259,47 +1473,58 @@ msgstr "ఆ పేర�ని ఇప�పటికే వాడ�త�న�
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "ఆ పేర�ని అన�మతించమ�."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "పేర� లేదా ఈమెయిల�"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr ""
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Jabber ID లేద�."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr ""
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr ""
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr ""
 
@@ -1311,11 +1536,15 @@ msgstr "నిర�ధారణ సంకేతం లేద�."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "విషయం లేద�!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr ""
 
@@ -1324,7 +1553,9 @@ msgid "No id."
 msgstr "�డీ లేద�."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr ""
 
@@ -1335,6 +1566,7 @@ msgstr "దూరప� సర�వర� పేర�ని ఇవ�వలే
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 #, fuzzy
 msgid "No nickname."
 msgstr "పేర� లేద�."
@@ -1343,12 +1575,14 @@ msgstr "పేర� లేద�."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "రద�ద�చేయడానికి వేచివ�న�న నిర�ధారణలేమీ లేవ�."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr ""
 
@@ -1358,7 +1592,8 @@ msgid "No profile URL returned by server."
 msgstr ""
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "ఈ వాడ�కరికై నమోదైన ఈమెయిల� చిర�నామాల� �మీ లేవ�."
 
@@ -1370,7 +1605,7 @@ msgstr "అభ�యర�థనలేమీ కనబడలేద�!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "ఫలితాలేమీ లేవ�"
 
@@ -1381,12 +1616,16 @@ msgstr "పరిమాణం లేద�."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1396,13 +1635,15 @@ msgid "No such OpenID."
 msgstr "అట�వంటి ఓపెన��డీ లేద�."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "అట�వంటి పత�రమేమీ లేద�."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "అట�వంటి సందేశమేమీ లేద�."
 
@@ -1440,12 +1681,22 @@ msgstr ""
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "అట�వంటి వాడ�కరి లేర�."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr ""
 
@@ -1459,32 +1710,38 @@ msgid "Not a recovery code."
 msgstr ""
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr ""
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "సరైన Jabber �డీ కాద�"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "సరైన ఓపెన��డీ కాద�."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "సరైన ఈమెయిల� చిర�నామా కాద�:"
 
@@ -1492,6 +1749,11 @@ msgstr "సరైన ఈమెయిల� చిర�నామా కాద�
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "సరైన పేర� కాద�."
 
@@ -1511,7 +1773,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "బొమ�మ కాద� లేదా పాడైపోయిన ఫైల�."
 
@@ -1522,13 +1785,15 @@ msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
-msgstr ""
+msgstr "దొరకలేద�"
 
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
@@ -1542,11 +1807,15 @@ msgstr ""
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "లోనికి ప�రవేశించలేద�."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr ""
 
@@ -1563,40 +1832,44 @@ msgid "Notice feed for %s"
 msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr ""
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "సందేశాల�"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "పాత సంకేతపదం"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "ఓపెన��డీ"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-#, fuzzy
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "ఓపెన��డీ ఖాతా అమర�ప�"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr ""
 
@@ -1604,29 +1877,34 @@ msgstr ""
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "ఓపెన��డీ ప�రవేశం"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "ఓపెన��డీ URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "ఓపెన��డీ అధీకరణ రద�ద� చేయబడింది."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "ఓపెన��డీ అధీకరణ విఫలమైంది: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "ఓపెన��డీ వైఫల�యం: %s"
@@ -1642,11 +1920,12 @@ msgid "OpenID settings"
 msgstr "ఓపెన��డీ అమరికల�"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "పాక�షిక ఎగ�మతి."
 
@@ -1656,41 +1935,53 @@ msgstr "పాక�షిక ఎగ�మతి."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "సంకేతపదం"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "సంకేతపదం మరియ� నిర�ధారణ సరిపోలేద�."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక�కవ అక�షరాల�ండాలి."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "సంకేతపదం భద�రమయ�యింది."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "సంకేతపదాల� సరిపోలలేద�."
 
 #: ../lib/searchaction.php:100 lib/searchaction.php:100
 #: lib/searchgroupnav.php:80
 msgid "People"
-msgstr ""
+msgstr "ప�రజల�"
 
 #: ../actions/opensearch.php:33 actions/opensearch.php:33
 #: actions/opensearch.php:64
@@ -1703,14 +1994,17 @@ msgid "People search"
 msgstr "వ�యక�త�ల అన�వేషణ"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "వ�యక�తిగత"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
-msgstr ""
+msgstr "వ�యక�తిగత సందేశం"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
@@ -1722,7 +2016,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
@@ -1731,7 +2025,9 @@ msgstr ""
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "అభిర�చ�ల�"
 
@@ -1740,42 +2036,52 @@ msgstr "అభిర�చ�ల�"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "అభిర�చ�ల� భద�రమయ�యాయి."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
-msgstr ""
+msgstr "ప�రాథాన�యతా భాష"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "అంతరంగికత"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "సందేశాన�ని భద�రపరచడంలో పొరపాట�."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "ప�రొఫైల�"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "ప�రొఫైల� URL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "ఫ�రొఫైల� అమరికల�"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "అజ�ఞాత ప�రొఫైల�"
 
@@ -1784,17 +2090,19 @@ msgid "Public Stream Feed"
 msgstr "ప�రజా వాహిని ఫీడ�"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "ప�రజా కాలరేఖ"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1804,12 +2112,14 @@ msgid "Recent Tags"
 msgstr ""
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr ""
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr ""
 
@@ -1822,37 +2132,45 @@ msgstr ""
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "నమోద�"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr ""
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "తిరస�కరించ�"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "నన�న� గ�ర�త�ంచ�కో"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr ""
 
@@ -1866,6 +2184,9 @@ msgstr ""
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "తొలగించ�"
 
@@ -1874,7 +2195,7 @@ msgstr "తొలగించ�"
 msgid "Remove OpenID"
 msgstr "ఓపెన��డీని తొలగించండి"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1883,53 +2204,61 @@ msgstr ""
 "మ�ంద� వేరే ఓపెన��డీని చేర�చండి."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "స�పందనల�"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "%sకి స�పందనల�"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr ""
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr ""
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr ""
 
 #: ../actions/smssettings.php:33 actions/smssettings.php:33
 #: actions/smssettings.php:58
 msgid "SMS Settings"
-msgstr ""
+msgstr "SMS అమరికల�"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "పై సంకేతపదం వలెనే"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -1942,12 +2271,21 @@ msgstr ""
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "భద�రపరచ�"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "వెత�క�"
 
@@ -1957,7 +2295,7 @@ msgid "Search Stream Feed"
 msgstr "అన�వేషణ వాహిని ఫీడ�"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1966,7 +2304,7 @@ msgstr ""
 "%%site.name%%లోని సందేశాలన� వెతకండి. అన�వేషణ పదాలన� ఖాళీలతో వేర�చేయండి; ఒక�కో పదంలో 3 లేదా "
 "అంతకంటే ఎక�క�వ అక�షరాల� ఉండాలి."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -1976,48 +2314,56 @@ msgstr ""
 "ఖాళీలతో వేర�చేయండి; ఒక�కో పదంలో 3 లేదా అంతకంటే ఎక�క�వ అక�షరాల� ఉండాలి."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "పంపించ�"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "అమరికల�"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "అమరికల� భద�రమయ�యాయి."
 
@@ -2037,27 +2383,32 @@ msgid "Something weird happened."
 msgstr "జరగకూడనిదేదో జరిగింది."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "మూలమ�"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "గణాంకాల�"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr ""
 
@@ -2065,24 +2416,28 @@ msgstr ""
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr ""
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "చందాదార�ల�"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr ""
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "చందాని తిరస�కరించార�."
 
@@ -2090,28 +2445,35 @@ msgstr "చందాని తిరస�కరించార�."
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "చందాల�"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr ""
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "పాఠ�యం"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "పాఠ�య అన�వేషణ"
 
@@ -2131,6 +2493,7 @@ msgid "That confirmation code is not for you!"
 msgstr "ఆ నిర�ధారణా సంకేతం మీది కాద�!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "ఆ ఈమెయిల� చిర�నామా ఇప�పటేకే ఇతర వాడ�కరికి సంబంధించినది."
 
@@ -2140,63 +2503,73 @@ msgid "That file is too big."
 msgstr "ఆ ఫైల� చాలా పెద�దగా ఉంది."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "ఈ Jabber ID మీక� ఇప�పటికే ఉంది"
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "అది ఇప�పటికే మీ ఈమెయిల� చిర�నామా."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "ఇది మీ Jabber ID కాద�"
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "ఆ IM చిర�నామా సరైనది కాద�."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "ఇది చాలా పొడవ�ంది. గరిష�ఠ సందేశ పరిమాణం 140 అక�షరాల�."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" అనే చిర�నామా మీ ఖాతాకి నిర�ధారితమైంది."
@@ -2205,18 +2578,22 @@ msgstr "\"%s\" అనే à°šà°¿à°°à±�నామా మీ ఖాతాకి à°¨à
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "ఆ చిర�నామాని తొలగించాం."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2224,40 +2601,45 @@ msgid ""
 msgstr ""
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr ""
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "ఈ నిర�ధారణ సంకేతం చాలా పాతది. మళ�ళీ మొదల�పెట�టండి."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2269,6 +2651,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
@@ -2277,25 +2662,37 @@ msgstr ""
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
-msgstr ""
+msgstr "కాలమండలం"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
-msgstr ""
+msgstr "కాలమండలాన�ని ఎంచ�కోలేద�."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2304,18 +2701,21 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "మీ హోమ� పేజీ, బ�లాగ�, లేదా వేరే సేట�లోని మీ ప�రొఫైల� యొక�క చిర�నామా"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
@@ -2327,15 +2727,22 @@ msgstr ""
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr ""
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr ""
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr ""
 
@@ -2364,38 +2771,47 @@ msgstr ""
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr ""
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "ఎగ�మతించ�"
 
@@ -2412,12 +2828,15 @@ msgid "Upload a new profile image"
 msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "తాజా విశేషాల�, ప�రకటనల�, మరియ� సంకేతపదం పోయినప�ప�డ� మాత�రమే ఉపయోగిస�తాం."
 
@@ -2441,42 +2860,51 @@ msgstr ""
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "వాడ�కరి పేర�"
 
 #: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
-msgstr ""
+msgstr "వాడ�కరి దొరకలేద�."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "%s, సంగత�లేమిటి?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "మీర� ఎక�కడ న�ండి, \"నగరం, రాష�ట�రం (లేదా ప�రాంతం), దేశం\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "'%s' కొరక� తప�ప�డ� బొమ�మ రకం"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
@@ -2484,7 +2912,9 @@ msgstr ""
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "అవ�న�"
 
@@ -2505,11 +2935,12 @@ msgid "You are already logged in!"
 msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2527,20 +2958,22 @@ msgstr "సందేశాలà±� పంపించడానికి మీరà
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "\"తొలగించ�\" అనే బొత�తంపై నొక�కడం ద�వారా ఒక ఓపెన��డీని మీ ఖాతా న�ండి తొలగించ�కోవచ�చ�."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2549,21 +2982,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2577,35 +3012,39 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr ""
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "మిమ�మల�ని గ�ర�తించాం. కొత�త సంకేతపదాన�ని క�రింద ఇవ�వండి."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "మీ ఓపెన��డీ URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "ఈ సర�వర�లో మీ పేర�, లేదా నమౌదైన మీ ఈమెయిల� చిర�నామా."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2614,54 +3053,64 @@ msgstr ""
 "ఒకే వాడ�కరి ఖాతాతో చాలా సైట�లలోనికి ప�రవేశించే వీల�ని [ఓపెన��డీ](%%doc.openid%%) కల�పిస�త�ంది. మీ "
 "ఓపెన��డీలన� ఇక�కడ సంభాళించ�కోండి."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "కొన�ని క�షణాల క�రితం"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "%d రోజ�ల క�రితం"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d గంటల క�రితం"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d నిమిషాల క�రితం"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "%d నెలల క�రితం"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "ఓ రోజ� క�రితం"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "ఓ నిమిషం క�రితం"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "ఓ నెల క�రితం"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "ఒక సంవత�సరం క�రితం"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "ఒక గంట క�రితం"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
 #: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
-msgstr ""
+msgstr "తొలగించ�"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
 #: ../lib/stream.php:117 actions/noticesearch.php:136
@@ -2676,17 +3125,18 @@ msgid "reply"
 msgstr "స�పందించ�"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "పై సంకేతపదం వలెనే"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr ""
 
 #: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
 msgid "« After"
 msgstr "« తర�వాత"
 
@@ -2703,6 +3153,26 @@ msgstr "« తర�వాత"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2711,6 +3181,7 @@ msgid "This notice is not a favorite!"
 msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -2718,22 +3189,28 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2743,11 +3220,13 @@ msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2787,35 +3266,46 @@ msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr ""
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
-msgstr ""
+msgstr "కొత�త సందేశం"
 
 #: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
@@ -2867,6 +3357,11 @@ msgstr ""
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr ""
 
@@ -2895,6 +3390,8 @@ msgid "New password successfully saved. "
 msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2915,12 +3412,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2928,7 +3428,7 @@ msgstr ""
 msgid "No such message."
 msgstr ""
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
@@ -2952,51 +3452,70 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
@@ -3015,14 +3534,17 @@ msgid ""
 msgstr ""
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "ట�విట�టర� అమరికల�"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "ట�విట�టర� ఖాతా"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -3031,6 +3553,7 @@ msgid "Twitter Username"
 msgstr ""
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr ""
 
@@ -3039,24 +3562,29 @@ msgid "Twitter Password"
 msgstr ""
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -3067,33 +3595,43 @@ msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -3110,18 +3648,19 @@ msgid "The subscription has been rejected, but no "
 msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
-msgstr ""
+msgstr "ఆదేశ ఫలితాల�"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
-msgstr ""
+msgstr "ఆదేశం పూర�తయ�యింది"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
-msgstr ""
+msgstr "ఆదేశం విఫలమైంది"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3131,101 +3670,123 @@ msgid "Subscriptions: %1$s\n"
 msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "పూర�తిపేర�: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "ప�రాంతం: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "గ�రించి: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
 #: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
-msgstr ""
+msgstr "ఆదేశాల�:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3240,7 +3801,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -3252,7 +3813,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3261,51 +3822,64 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "వాడ�కరి"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "మీక� వచ�చిన సందేశాల�"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "మీర� పంపిన సందేశాల�"
 
 #: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
-msgstr ""
+msgstr "ట�విట�టర�"
 
 #: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
 msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s మరియ� మిత�ర�ల�"
@@ -3315,22 +3889,31 @@ msgid "You can upload your personal avatar."
 msgstr ""
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-#, fuzzy
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
-msgstr "ట�విట�టర� అమరికల�"
+msgstr "అవతారప� అమరికల�"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
-msgstr ""
+msgstr "అసల�"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
-msgstr ""
+msgstr "మ�న�జూప�"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
@@ -3347,35 +3930,44 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "అట�వంటి సందేశమేమీ లేద�."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr ""
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "అట�వంటి వాడ�కరి లేర�."
@@ -3384,12 +3976,12 @@ msgstr "అట�వంటి వాడ�కరి లేర�."
 msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 #, fuzzy
 msgid "You have already blocked this user."
 msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3406,40 +3998,58 @@ msgstr ""
 msgid "Add to favorites"
 msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "పేర� లేద�."
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "అట�వంటి సందేశమేమీ లేద�."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3448,16 +4058,17 @@ msgid "Nickname must have only lowercase letters "
 msgstr ""
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "స�వపరిచయం చాలా పెద�దగా ఉంది (140 అక�షరాల� గరిష�ఠం)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 #, fuzzy
 msgid "Options saved."
 msgstr "అమరికల� భద�రమయ�యాయి."
@@ -3475,7 +4086,8 @@ msgstr ""
 msgid "Send me email when someone "
 msgstr ""
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3489,7 +4101,7 @@ msgstr "ఆ ఈమెయిల� చిర�నామా ఇప�పటేక
 msgid "A confirmation code was sent to the email address you added. "
 msgstr "ఆ నిర�ధారణా సంకేతం మీది కాద�!"
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3503,54 +4115,67 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "విషయం లేద�!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
-msgstr "« తర�వాత"
+msgstr "తర�వాత"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
-msgstr "ఇంతక�రితం »"
+msgstr "ఇంతక�రితం"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "%s యొక�క మిత�ర�ల ఫీడ�"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3596,12 +4221,14 @@ msgstr ""
 msgid "Sync preferences"
 msgstr "అభిర�చ�ల�"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr ""
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "అట�వంటి సందేశమేమీ లేద�."
@@ -3616,7 +4243,8 @@ msgid "The most popular notices on the site right now."
 msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3630,15 +4258,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr ""
 
@@ -3646,12 +4276,14 @@ msgstr ""
 msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "అవతారాన�ని తాజాకరించాం."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "అవతారప� తాజాకరణ విఫలమైంది."
@@ -3671,7 +4303,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
@@ -3686,6 +4319,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "కొత�త ఖాతా సృష�టించ�కోండి"
@@ -3698,7 +4332,7 @@ msgstr ""
 "%%site.name%%లో వ�యక�త�లన� వారి పేర�, ప�రాంతం, లేదా ఆసక�త�లన� బట�టి వెతకండి. అన�వేషించే పదాలన� "
 "ఖాళీలతో వేర�చేయండి; ఒక�కో పదంలో 3 లేదా అంతకంటే ఎక�క�వ అక�షరాల� ఉండాలి."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "వ�యక�త�ల అన�వేషణ"
@@ -3721,21 +4355,21 @@ msgstr ""
 msgid "A confirmation code was sent "
 msgstr "నిర�ధారణ సంకేతం లేద�."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr ""
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr ""
@@ -3744,16 +4378,19 @@ msgstr ""
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "అట�వంటి సందేశమేమీ లేద�."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr ""
 
@@ -3761,21 +4398,25 @@ msgstr ""
 msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr ""
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "ఓపెన��డీ ఫారమ�న� సృష�టించలేకపోయాం: %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -3785,18 +4426,20 @@ msgstr ""
 
 #: actions/newgroup.php:53
 msgid "New group"
-msgstr ""
+msgstr "కొత�త గ�ంప�"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "అవతారప� సమాచారాన�ని భద�రపరచలేక�న�నాం"
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "చందాని సృష�టించలేకపోయాం."
@@ -3810,12 +4453,15 @@ msgstr "ఆ ఫైల� చాలా పెద�దగా ఉంది."
 msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 #, fuzzy
 msgid "Notice posted"
 msgstr "సందేశాల�"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr ""
 
@@ -3832,8 +4478,7 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/openidlogin.php:97
-#, fuzzy
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr "ఓపెన��డీ ప�రవేశం"
 
@@ -3843,9 +4488,8 @@ msgid "Removing your only OpenID "
 msgstr "ఓపెన��డీని తొలగించండి"
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other Settings"
-msgstr "ట�విట�టర� అమరికల�"
+msgstr "ఇతర అమరికల�"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -3856,15 +4500,16 @@ msgid "URL Auto-shortening"
 msgstr ""
 
 #: actions/othersettings.php:112
-#, fuzzy
 msgid "Service"
-msgstr "వెత�క�"
+msgstr "సేవ"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "ప�రాంతం పేర� మరీ పెద�దగా ఉంది (255 అక�షరాల� గరిష�ఠం)."
@@ -3874,17 +4519,18 @@ msgstr "à°ªà±�రాంతం పేరà±� మరీ పెదà±�దగా à°‰à°
 msgid "Change your password."
 msgstr "సంకేతపదం మార�చ�కోండి"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "సంకేతపదం భద�రమయ�యింది."
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "సరైన ఈమెయిల� చిర�నామా కాద�:"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -3894,12 +4540,13 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "అజ�ఞాత ప�రొఫైల�"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -3909,21 +4556,26 @@ msgid "Automatically subscribe to whoever "
 msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "'%s' అనే హోమ� పేజీ సరైనదికాద�"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "ప�రొఫైల�ని భద�రపరచలేక�న�నాం."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "ప�రజా కాలరేఖ"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
@@ -3944,11 +4596,13 @@ msgstr "ప�రజా వాహిని ఫీడ�"
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4003,7 +4657,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "%sకి స�పందనల�"
@@ -4013,55 +4668,75 @@ msgstr "%sకి స�పందనల�"
 msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
-msgstr ""
+msgstr "%s గ�ంప�"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "అట�వంటి సందేశమేమీ లేద�."
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "సందేశాల�"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
-msgstr "సభ�య�లైన తేదీ"
+msgstr "సభ�య�ల�"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
-msgstr ""
+msgstr "అందర� సభ�య�లూ"
 
 #: actions/showgroup.php:378
 #, php-format
@@ -4074,10 +4749,10 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
-msgstr ""
+msgstr "%s, పేజీ %d"
 
 #: actions/showstream.php:143
 #, fuzzy
@@ -4085,32 +4760,39 @@ msgid "'s profile"
 msgstr "ప�రొఫైల�"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
-msgstr ""
+msgstr "వాడ�కరి చర�యల�"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr ""
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "చందాదార�ల�"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr ""
 
@@ -4135,7 +4817,7 @@ msgstr ""
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "ఆ నిర�ధారణా సంకేతం మీది కాద�!"
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr ""
 
@@ -4159,9 +4841,9 @@ msgid "Subscribed"
 msgstr "చందాదార�ల�"
 
 #: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers"
-msgstr "చందాదార�ల�"
+msgstr "%s చందాదార�ల�"
 
 #: actions/subscribers.php:52
 #, php-format
@@ -4196,17 +4878,18 @@ msgstr ""
 msgid "These are the people whose "
 msgstr ""
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "Jabber ID లేద�."
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "%s యొక�క మైక�రోబ�లాగ�"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4230,7 +4913,7 @@ msgstr ""
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4240,17 +4923,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "అవతారప� సమాచారాన�ని భద�రపరచలేక�న�నాం"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4259,20 +4942,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "అట�వంటి సందేశమేమీ లేద�."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "%s యొక�క మైక�రోబ�లాగ�"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "అభ�యర�థనలేమీ కనబడలేద�!"
@@ -4281,17 +4967,17 @@ msgstr "అభ�యర�థనలేమీ కనబడలేద�!"
 msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 #, fuzzy
 msgid "Twitter user name"
 msgstr "ట�విట�టర� అమరికల�"
 
-#: actions/twittersettings.php:126
-#, fuzzy
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
-msgstr "కొత�త సంకేతపదం"
+msgstr "ట�విట�టర� సంకేతపదం"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 #, fuzzy
 msgid "Twitter Friends"
 msgstr "ట�విట�టర� అమరికల�"
@@ -4305,155 +4991,163 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr "ఈమెయిల� నిర�ధారణని తొలగించలేక�న�నాం."
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "వాడ�కరిని భద�రపరచడంలో పొరపాట�."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr ""
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr ""
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "చందాదార�ల�"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
-msgstr ""
+msgstr "%s గ�ంప�ల�"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr ""
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "సందేశాన�ని భద�రపరచడంలో పొరపాట�."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 #, fuzzy
 msgid "Upload an avatar"
 msgstr "అవతారప� తాజాకరణ విఫలమైంది."
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
-msgstr ""
+msgstr "ఇతర"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
-msgstr ""
+msgstr "ఇతర ఎంపికల�"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
-msgstr ""
+msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328
-#, fuzzy
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
-msgstr "గ�రించి"
+msgstr "ఖాతా"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "కొత�త ఖాతా సృష�టించ�కోండి"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "అట�వంటి ఓపెన��డీ లేద�."
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "సహాయం"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "కొత�త సందేశం"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "కొత�త సందేశం"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "చందాల�"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "అట�వంటి వాడ�కరి లేర�."
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr ""
 
@@ -4466,12 +5160,15 @@ msgstr ""
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "కొత�త ఖాతా సృష�టించ�కోండి"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 #, fuzzy
 msgid "Published"
 msgstr "ప�రజా"
@@ -4491,36 +5188,40 @@ msgstr ""
 
 #: lib/galleryaction.php:131
 msgid "All"
-msgstr ""
+msgstr "అన�నీ"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
-msgstr ""
+msgstr "వెళ�ళ�"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "మీ హోమ� పేజీ, బ�లాగ�, లేదా వేరే సేట�లోని మీ ప�రొఫైల� యొక�క చిర�నామా"
 
-#: lib/groupeditform.php:151
-#, fuzzy
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
-msgstr "చందాల�"
+msgstr "వివరణ"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "మీ గ�రించి మరియ� మీ ఆసక�త�ల గ�రించి 140 అక�షరాల�లో చెప�పండి"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4528,23 +5229,22 @@ msgstr "మీరà±� à°Žà°•à±�à°•à°¡ à°¨à±�à°‚à°¡à°¿, \"నగరం, రాషà
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
-msgstr ""
+msgstr "గ�ంప�"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
-#, fuzzy
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
-msgstr "నిష�క�రమించ�"
+msgstr "చిహ�నం"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
@@ -4577,12 +5277,12 @@ msgstr "ప�రవేశించండి"
 msgid "Leave"
 msgstr "భద�రపరచ�"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "వాడ�కరిపేర� లేదా సంకేతపదం తప�ప�."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "కొత�త ఖాతా సృష�టించ�కోండి"
@@ -4603,24 +5303,24 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr ""
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "ప�రాంతం: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "హోమ� పేజీ\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
@@ -4635,45 +5335,53 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "కొత�త సందేశం"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 లేదా అంతకంటే ఎక�క�వ అక�షరాల�"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 #, fuzzy
 msgid "in reply to"
 msgstr "దీనికి స�పందనగా..."
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "స�పందించ�"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
-msgstr ""
+msgstr "తొలగించ�"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
@@ -4692,27 +5400,29 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "ప�రజా"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "వ�యక�త�ల అన�వేషణ"
@@ -4730,32 +5440,34 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "%sకి స�పందనల�"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "చందాదార�ల�"
@@ -4769,11 +5481,12 @@ msgid "Top posters"
 msgstr ""
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 #, fuzzy
 msgid "Unblock this user"
 msgstr "అట�వంటి వాడ�కరి లేర�."
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr ""
 
@@ -4781,20 +5494,1984 @@ msgstr ""
 msgid "Unsubscribe from this user"
 msgstr ""
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s యొక�క మిత�ర�ల ఫీడ�"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s యొక�క మిత�ర�ల ఫీడ�"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s యొక�క మిత�ర�ల ఫీడ�"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s మరియ� మిత�ర�ల�"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "అవతారాన�ని తాజాకరించాం."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "%s యొక�క మైక�రోబ�లాగ�"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"%%site.name%%లో వ�యక�త�లన� వారి పేర�, ప�రాంతం, లేదా ఆసక�త�లన� బట�టి వెతకండి. అన�వేషించే పదాలన� "
+"ఖాళీలతో వేర�చేయండి; ఒక�కో పదంలో 3 లేదా అంతకంటే ఎక�క�వ అక�షరాల� ఉండాలి."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "\"%s\"కై అన�వేషణ వాహిని"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"భద�రతా కారణాల దృష�ట�యా, అమరికల� మార�చే మ�ంద� మీ వాడ�కరి పేర�ని మరియ� సంకేతపదాన�ని మరోసారి ఇవ�వండి."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "ప�రజా వాహిని ఫీడ�"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "ప�రజా వాహిని ఫీడ�"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "ప�రజా వాహిని ఫీడ�"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "ఈ అంతరంగిక భోగట�టా తప�ప: సంకేతపదం, ఈమెయిల� చిర�నామా, IM చిర�నామా, ఫోన� నంబర�."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "సృష�టించ�"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "అట�వంటి సందేశమేమీ లేద�."
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "ప�రొఫైల�"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "అవతారం"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "ఫ�రొఫైల� అమరికల�"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "ఆ నిర�ధారణా సంకేతం మీది కాద�!"
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "అట�వంటి వాడ�కరి లేర�."
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "ఈమెయిల� నిర�ధారణని తొలగించలేక�న�నాం."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+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/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, 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 ""
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "వెత�క�"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "అట�వంటి పత�రమేమీ లేద�."
+
+#: actions/block.php:149
+msgid "Do not block this user from this group"
+msgstr ""
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "అట�వంటి వాడ�కరి లేర�."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s మరియ� మిత�ర�ల�"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "అట�వంటి వాడ�కరి లేర�."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "ప�రాంతం"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "ఈ నోటీస�ని తొలగించలేమ�."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "'%s' అనే హోమ� పేజీ సరైనదికాద�"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "ఆ పేర�ని ఇప�పటికే వాడ�త�న�నార�. మరోటి ప�రయత�నించండి."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "అవతారప� సమాచారాన�ని భద�రపరచలేక�న�నాం"
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "కొత�త సందేశం"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "కొత�త సందేశం"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "సరైన పేర� కాద�."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr ""
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "అట�వంటి వాడ�కరి లేర�."
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "అభిర�చ�ల� భద�రమయ�యాయి."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "ఫలితాలేమీ లేవ�"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+msgid "Message sent"
+msgstr ""
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "ప�రొఫైల�ని భద�రపరచలేక�న�నాం."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"ఒకే వాడ�కరి ఖాతాతో చాలా సైట�లలోనికి ప�రవేశించే వీల�ని [ఓపెన��డీ](%%doc.openid%%) కల�పిస�త�ంది. మీ "
+"ఓపెన��డీలన� ఇక�కడ సంభాళించ�కోండి."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "ఫ�రొఫైల� అమరికల�"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "కొత�త ఖాతా సృష�టించ�కోండి"
+msgid ""
+"If you've 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
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "మిమ�మల�ని గ�ర�తించాం. కొత�త సంకేతపదాన�ని క�రింద ఇవ�వండి."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "సంకేతపదం భద�రమయ�యింది."
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "నిర�ధారణ సంకేతంలో పొరపాట�."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "చందాదార�ల�"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "అట�వంటి సందేశమేమీ లేద�."
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "ఈమెయిల�ని నిర�ధారించలేక�న�నాం."
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
 
-#~ msgid "Email address"
-#~ msgstr "ఈమెయిల� చిర�నామా"
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "సందేశాన�ని చేర�చటంలో పొరపాట�"
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "అట�వంటి వాడ�కరి లేర�."
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr ""
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "అది ఇప�పటికే మీ ఈమెయిల� చిర�నామా."
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr ""
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "%s యొక�క మైక�రోబ�లాగ�"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "అన�ని చందాల�"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "ఫ�రొఫైల� అమరికల�"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr "మీర� మీ సంకేతపదాన�ని మర�చిపోతే, మీ ఖాతాలో భద�రపరచిన ఈమెయిల�కి కొత�తదాన�ని పంపించ�కోవచ�చ�."
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "సందేశాన�ని భద�రపరచడంలో పొరపాట�."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr "జోడింప�ల�"
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "ప�రొఫైల�"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "ఎగ�మతించ�"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "సంకేతపదం మార�చ�కోండి"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "అన�సంధానించ�"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "వెత�క�"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "ప�రవేశించండి"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "అట�వంటి వాడ�కరి లేర�."
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "అట�వంటి వాడ�కరి లేర�."
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "విషయం లేద�!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "వాడ�కరి"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "వెత�క�"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "హోమ� పేజీ URL సరైనది కాద�."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "అట�వంటి సందేశమేమీ లేద�."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "ఇది చాలా పొడవ�ంది. గరిష�ఠ సందేశ పరిమాణం 140 అక�షరాల�."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "ఓపెన��డీ ఫారమ�న� సృష�టించలేకపోయాం: %s"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "స�వపరిచయం చాలా పెద�దగా ఉంది (140 అక�షరాల� గరిష�ఠం)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "ఓపెన��డీ ఫారమ�న� సృష�టించలేకపోయాం: %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "ఓపెన��డీ ఫారమ�న� సృష�టించలేకపోయాం: %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s గ�ంప�ల�"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "అవతారాన�ని తాజాకరించాం."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "ఇది చాలా పొడవ�ంది. గరిష�ఠ సందేశ పరిమాణం 140 అక�షరాల�."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr ""
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "స�వపరిచయం చాలా పెద�దగా ఉంది (140 అక�షరాల� గరిష�ఠం)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "%s యొక�క మైక�రోబ�లాగ�"
+
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:109
+msgid "Could not convert request token to access token."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr ""
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "అట�వంటి సందేశమేమీ లేద�."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "అట�వంటి సందేశమేమీ లేద�."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "%s యొక�క మైక�రోబ�లాగ�"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "హోమ� పేజీ URL సరైనది కాద�."
+
+#: actions/login.php:259
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "%s యొక�క మైక�రోబ�లాగ�"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "\"%s\"తో సరిపోలే అన�ని తాజాకరణల�"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "అన�సంధానించ�"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "మీ గ�రించి మరియ� మీ ఆసక�త�ల గ�రించి 140 అక�షరాల�లో చెప�పండి"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "మీ గ�రించి మరియ� మీ ఆసక�త�ల గ�రించి 140 అక�షరాల�లో చెప�పండి"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "స�వపరిచయం చాలా పెద�దగా ఉంది (140 అక�షరాల� గరిష�ఠం)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr ""
+
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
+msgstr ""
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "%sకి స�పందనల�"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s యొక�క మిత�ర�ల ఫీడ�"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s యొక�క మిత�ర�ల ఫీడ�"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s యొక�క మిత�ర�ల ఫీడ�"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "%s గ�ంప�"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "సందేశాల�"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "హోమ� పేజీ URL సరైనది కాద�."
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: 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:249
+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:261
+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:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "'%s' అనే అవతారప� URL తప�ప�"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "'%s' కొరక� తప�ప�డ� బొమ�మ రకం"
+
+#: lib/action.php:435
+msgid "Connect to services"
+msgstr ""
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "కొత�త సందేశం"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "%sకి స�పందనల�"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "సందేశాన�ని భద�రపరచడంలో పొరపాట�."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "నిర�ధారణ సంకేతం లేద�."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "మీ గ�రించి మరియ� మీ ఆసక�త�ల గ�రించి 140 అక�షరాల�లో చెప�పండి"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "మీ గ�రించి మరియ� మీ ఆసక�త�ల గ�రించి 140 అక�షరాల�లో చెప�పండి"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "కొత�త సందేశం"
+
+#: lib/mail.php:554
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr ""
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " న�ండి "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "కొత�త సందేశం"
diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo
index d49c7093d..7c579c44a 100644
--- a/locale/tr/LC_MESSAGES/statusnet.mo
+++ b/locale/tr/LC_MESSAGES/statusnet.mo
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 4dbc221d1..ec8b3fd9a 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -1,33 +1,29 @@
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Turkish
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-01-26 00:13+0000\n"
-"Last-Translator: Egemen Metin Turan <emturan@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:40+0000\n"
+"Language-Team: Turkish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-"X-Poedit-Language: Turkish\n"
-"X-Poedit-Country: TURKEY\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: tr\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " \"%s\" için arama sonuçları"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -40,17 +36,19 @@ msgid " from "
 msgstr ""
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -82,6 +80,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
@@ -104,25 +103,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Genel Durum Mesajları"
@@ -132,40 +134,55 @@ msgstr "%s Genel Durum Mesajları"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s ve arkadaşları"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s durum"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -174,7 +191,8 @@ msgstr ""
 "**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından "
 "hazırlanan anında mesajlaşma ağıdır. "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
@@ -186,32 +204,36 @@ msgstr "Katkı sunanlar tam ad veya takma ad ile atfedilmelidir."
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
 "verilmez"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 veya daha fazla karakter"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "Unutmayın, 6 veya daha fazla karakter"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr ""
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -221,6 +243,7 @@ msgstr ""
 "mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -250,7 +273,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
@@ -273,16 +323,23 @@ msgstr ""
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Hakkında"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Kabul et"
 
@@ -293,6 +350,9 @@ msgstr "Kabul et"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Ekle"
 
@@ -310,27 +370,29 @@ msgstr ""
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "Adres"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Bütün abonelikler"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "%s için bütün güncellemeler"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
@@ -340,31 +402,38 @@ msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Zaten abone olunmuÅŸ!."
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Takip isteÄŸini onayla"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -372,15 +441,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Avatar güncellendi."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -390,13 +463,14 @@ msgstr ""
 "içeren mesajı almak için kontrol edin. (%s'u arkadaş listenize eklediniz mi?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
@@ -408,6 +482,8 @@ msgstr "Önce »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Hakkında"
 
@@ -415,16 +491,18 @@ msgstr "Hakkında"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr ""
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Avatar URLi '%s' okunamıyor"
@@ -432,6 +510,8 @@ msgstr "Avatar URLi '%s' okunamıyor"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Yeni parola kaydedilemedi."
 
@@ -439,31 +519,34 @@ msgstr "Yeni parola kaydedilemedi."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Ä°ptal et"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "OpenID iÅŸlemlerinde hata oluÅŸtu."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Jabber iÅŸlemlerinde bir hata oluÅŸtu."
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "DeÄŸiÅŸtir"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr ""
 
@@ -473,11 +556,12 @@ msgid "Change password"
 msgstr "Parolayı değiştir"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr ""
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr ""
 
@@ -487,6 +571,9 @@ msgstr ""
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Onayla"
 
@@ -499,12 +586,14 @@ msgstr "Adresi Onayla"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Onaylama iptal edildi."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr ""
 
@@ -513,7 +602,8 @@ msgstr ""
 msgid "Confirmation code not found."
 msgstr "Onay kodu bulunamadı."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -533,20 +623,24 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "BaÄŸlan"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Varolan hesaba baÄŸlan"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Ä°letiÅŸim"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "OpenID formu yaratılamadı: %s"
@@ -554,35 +648,39 @@ msgstr "OpenID formu yaratılamadı: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr ""
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Sunucuya yönlendirme yapılamadı: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Avatar bilgisi kaydedilemedi"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Yeni profil bilgisi kaydedilemedi"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr ""
 
@@ -602,15 +700,17 @@ msgstr ""
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Eposta onayı silinemedi."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Abonelik silinemedi."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr ""
 
@@ -619,34 +719,42 @@ msgstr ""
 msgid "Couldn't get a request token."
 msgstr ""
 
-#  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Onay kodu eklenemedi."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Profil kaydedilemedi."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -662,42 +770,48 @@ msgstr ""
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Kullanıcı güncellenemedi."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Yarat"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Bu takma ad ile yeni bir kullanıcı oluştur."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Yeni hesap oluÅŸtur"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "OpenID kullanıcısı için hesap oluşturuluyor"
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Onaylanmış Jabber/Gtalk adresi."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -706,23 +820,27 @@ msgid "Currently"
 msgstr "Åžu anda"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Cevap eklenirken veritabanı hatası: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr ""
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
@@ -730,11 +848,13 @@ msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Eposta"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr ""
 
@@ -744,39 +864,43 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Eposta adresi zaten var."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Eposta adresi onayı"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr ""
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Bir takma ad veya eposta adresi girin."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Kullanıcıyı OpenID'ye bağlarken hata oluştu."
 
@@ -787,39 +911,46 @@ msgstr "Kullanıcı bağlamada hata oluştu."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Avatar eklemede hata oluÅŸtu"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Yeni profil eklemede hata oluÅŸtu"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Uzak profil eklemede hata oluÅŸtu"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Adres onayını kaydetmede hata."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Uzaktaki profili kaydetmede hata oluÅŸtu"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Profili kaydetmede hata oluÅŸtu."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Kullanıcıyı kaydetmede hata oluştu."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 
@@ -828,6 +959,9 @@ msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
@@ -838,6 +972,7 @@ msgstr "Profil güncellemede hata oluştu"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Uzaktaki profili güncellemede hata oluştu"
 
@@ -847,33 +982,36 @@ msgid "Error with confirmation code."
 msgstr "Onay kodu hatası."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Varolan takma ad"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "SSS"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Avatar güncellemede hata."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Cevaplar için RSS Beslemesi: %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
@@ -888,7 +1026,7 @@ msgstr ""
 msgid "Find people on this site"
 msgstr ""
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -901,6 +1039,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Tam Ä°sim"
 
@@ -909,24 +1052,33 @@ msgstr "Tam Ä°sim"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tam isim çok uzun (azm: 255 karakter)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Yardım"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Başlangıç"
 
-#  Belki Durum Merkezi falan denebilir mi ki?
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Başlangıç Sayfası"
 
@@ -934,21 +1086,27 @@ msgstr "Başlangıç Sayfası"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr ""
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr ""
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM adresi"
 
@@ -958,7 +1116,7 @@ msgid "IM Settings"
 msgstr "IM Ayarları"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -966,7 +1124,7 @@ msgstr ""
 "Eğer zaten bir hesabınız varsa, kullanıcı adınız ve parolanız ile giriş "
 "yapıp hesabınızı OpenID'nize bağlayabilirsiniz."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -974,7 +1132,7 @@ msgstr ""
 "Eğer hesabınıza bir OpenID eklemek istiyorsanız, aşağıdaki kutuya girin ve "
 "\"Add\" düğmesine tıklayın."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -983,25 +1141,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Eski parola yanlış"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1010,30 +1174,31 @@ msgstr ""
 "gerekli olan talimatlar yollanmıştır."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Geçersiz avatar URLi '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "%s Geçersiz başlangıç sayfası"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Geçersiz lisans URLi '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Geçersiz durum mesajı"
 
@@ -1048,13 +1213,13 @@ msgid "Invalid notice url"
 msgstr "Geçersiz durum adresi"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "'%s' geçersiz profil adresi."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
@@ -1072,28 +1237,35 @@ msgstr "Geçersiz büyüklük."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr ""
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1105,11 +1277,12 @@ msgstr ""
 "microbloglama yazılımının %s. versiyonunu kullanmaktadır."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID başka bir kullanıcıya ait."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1119,12 +1292,14 @@ msgstr ""
 "istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr ""
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
@@ -1133,7 +1308,15 @@ msgstr ""
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Yer"
 
@@ -1142,7 +1325,12 @@ msgstr "Yer"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 
@@ -1151,18 +1339,22 @@ msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "GiriÅŸ"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Bir [OpenID](%%doc.openid%%) hesabı ile giriş yapın."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1173,22 +1365,26 @@ msgstr ""
 "duruyorsunuz, hemen bir [yeni hesap oluÅŸturun](%%action.register%%) ya da "
 "[OpenID](%%action.openidlogin%%) ile giriş yapın."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Çıkış"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Parolamı unuttum veya kaybettim"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -1199,16 +1395,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Üyelik başlangıcı"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1218,42 +1416,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Durum mesajlarim ve dosyalarim şu lisans ile korunmaktadır: "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Yeni takma ad"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Yeni durum mesajı"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Yeni parola"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
 
@@ -1263,7 +1469,13 @@ msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Takma ad"
 
@@ -1272,7 +1484,12 @@ msgstr "Takma ad"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 
@@ -1281,49 +1498,60 @@ msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
 "kullanılamaz. "
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Takma ada izin verilmiyor."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Takip etmek istediğiniz kullanıcının takma adı"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Takma ad veya eposta"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr ""
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "JabberID yok."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Yetkilendirme isteÄŸi yok!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr ""
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr ""
 
@@ -1335,11 +1563,15 @@ msgstr "Onay kodu yok."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "İçerik yok!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr ""
 
@@ -1348,7 +1580,9 @@ msgid "No id."
 msgstr "Kullanıcı numarası yok"
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr ""
 
@@ -1359,6 +1593,7 @@ msgstr "Uzaktaki sunucu tarafından bir takma ad sağlanmadı."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Takma ad yok"
 
@@ -1366,12 +1601,14 @@ msgstr "Takma ad yok"
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "İptal etmek için beklenen onay yok."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr ""
 
@@ -1381,7 +1618,8 @@ msgid "No profile URL returned by server."
 msgstr ""
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
 
@@ -1393,7 +1631,7 @@ msgstr "İstek bulunamadı!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Sonuç yok"
 
@@ -1404,12 +1642,16 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1419,13 +1661,15 @@ msgid "No such OpenID."
 msgstr "Böyle bir OpenID yok."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Böyle bir belge yok."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Böyle bir durum mesajı yok."
 
@@ -1463,12 +1707,22 @@ msgstr "Böyle bir abonelik yok"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Böyle bir kullanıcı yok."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr ""
 
@@ -1482,32 +1736,38 @@ msgid "Not a recovery code."
 msgstr "Bir geri alma kodu deÄŸil."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr ""
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Geçersiz bir Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Geçersiz bir OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Geçersiz bir eposta adresi."
 
@@ -1515,6 +1775,11 @@ msgstr "Geçersiz bir eposta adresi."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
 
@@ -1534,7 +1799,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Geçersiz profil adresi (YADIS belgesi yok)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Bu bir resim dosyası değil ya da dosyada hata var"
 
@@ -1545,11 +1811,13 @@ msgstr "YetkilendirilmemiÅŸ."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr ""
 
@@ -1565,11 +1833,15 @@ msgstr ""
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Giriş yapılmadı."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
 
@@ -1586,39 +1858,44 @@ msgid "Notice feed for %s"
 msgstr "%s için durum RSS beslemesi"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Durum mesajları"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Eski parola"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "OpenID Hesabı Kurulumu"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr ""
 
@@ -1626,29 +1903,34 @@ msgstr ""
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "OpenID GiriÅŸi"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID URLi"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "OpenID yetkilendirilmesi iptal edildi."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID yetkilendirmesi başarız oldu: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID hatası: %s"
@@ -1664,11 +1946,12 @@ msgid "OpenID settings"
 msgstr "OpenID ayarları"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Kısmi yükleme."
 
@@ -1678,34 +1961,46 @@ msgstr "Kısmi yükleme."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Parola"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Parola ve onaylaması birbirini tutmuyor."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Parola geri alma isteÄŸi"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Parola kaydedildi."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Parolalar birbirini tutmuyor."
 
@@ -1725,14 +2020,17 @@ msgid "People search"
 msgstr "KiÅŸi Arama"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "KiÅŸisel"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr ""
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
@@ -1747,7 +2045,7 @@ msgstr ""
 "bulunmadıysanız \"İptal\" tuşuna basın. "
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 "Jabber/GTalk durum mesajim değiştiğinde nedurum.com'da durumumu güncelle"
@@ -1757,7 +2055,9 @@ msgstr ""
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Tercihler"
 
@@ -1766,42 +2066,52 @@ msgstr "Tercihler"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Gizlilik"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Profil"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "Profil Adresi"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profil ayarları"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Profil bilinmiyor"
 
@@ -1810,17 +2120,19 @@ msgid "Public Stream Feed"
 msgstr "Genel Durum Akış RSS Beslemesi"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Genel zaman çizgisi"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1830,12 +2142,14 @@ msgid "Recent Tags"
 msgstr ""
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Geri al"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Parolanı geri al"
 
@@ -1848,37 +2162,45 @@ msgstr "Bilinmeye kullanıcı için geri alma kodu"
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Kayıt"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr ""
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Reddet"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Beni hatırla"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Uzaktan abonelik"
 
@@ -1892,6 +2214,9 @@ msgstr "Uzaktan abonelik"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Kaldır"
 
@@ -1900,7 +2225,7 @@ msgstr "Kaldır"
 msgid "Remove OpenID"
 msgstr "OpenID'yi kaldır"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1909,34 +2234,41 @@ msgstr ""
 "istiyorsanuz, önce yeni bir OpenID ekleyin"
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Cevaplar"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "%s için cevaplar"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Sıfırla"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Parolayı sıfırla"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr ""
 
@@ -1945,17 +2277,18 @@ msgstr ""
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "yukarıdaki parolanın aynısı"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -1968,12 +2301,21 @@ msgstr ""
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Kaydet"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Ara"
 
@@ -1983,7 +2325,7 @@ msgid "Search Stream Feed"
 msgstr ""
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1992,7 +2334,7 @@ msgstr ""
 "%%site.name%%'da durum mesajlarının içeriğinde arama yap. Anahtar kelimeleri "
 "boşluk ile ayırın. Anahtar kelime 3 veya daha fazla karakterden oluşmalı."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2003,48 +2345,56 @@ msgstr ""
 "karakterden oluşmalı. "
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Gönder"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "Ayarlar"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "Ayarlar kaydedildi."
 
@@ -2064,27 +2414,32 @@ msgid "Something weird happened."
 msgstr "Garip bir ÅŸey oldu."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Kaynak"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Ä°statistikler"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Kaydedilmiş OpenID bulunamadı."
 
@@ -2092,24 +2447,28 @@ msgstr "Kaydedilmiş OpenID bulunamadı."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Abone ol"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abone olanlar"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Takip talebine izin verildi"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Abonelik reddedildi."
 
@@ -2117,28 +2476,35 @@ msgstr "Abonelik reddedildi."
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abonelikler"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Dosya yüklemede sistem hatası."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr ""
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr ""
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Metin arama"
 
@@ -2158,6 +2524,7 @@ msgid "That confirmation code is not for you!"
 msgstr "O onay kodu sizin için değil!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr ""
 
@@ -2167,64 +2534,74 @@ msgid "That file is too big."
 msgstr "Dosya çok büyük."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Bu zaten sizin Jabber ID'niz."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Bu sizin Jabber ID'niz deÄŸil."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Yanlış IM adresi."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" adresi hesabınız için onaylandı."
@@ -2233,18 +2610,22 @@ msgstr "\"%s\" adresi hesabınız için onaylandı."
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "Bu adres kaldırılmıştı."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2252,33 +2633,38 @@ msgid ""
 msgstr ""
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "%s adlı kullanıcının durumunu takip edenler"
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Sizin durumunuzu takip edenler"
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Sizin durumlarını takip ettiğiniz kullanıcılar"
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Onay kodu çok eski. Lütfen tekrar başlayınız."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2287,7 +2673,7 @@ msgstr ""
 "servis sağlayıcınıza yönlenmek için düğmeye basın."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2302,6 +2688,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
@@ -2310,25 +2699,37 @@ msgstr ""
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2337,19 +2738,22 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 "Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
@@ -2361,15 +2765,22 @@ msgstr ""
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "BeklenmeÄŸen form girdisi."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Beklemeğen parola sıfırlaması."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr ""
 
@@ -2400,38 +2811,47 @@ msgstr "Aboneliği sonlandır"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Desteklenmeyen OMB sürümü"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Desteklenmeyen görüntü dosyası biçemi."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Yükle"
 
@@ -2452,12 +2872,15 @@ msgid "Upload a new profile image"
 msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
@@ -2482,11 +2905,16 @@ msgstr ""
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Kullanıcının profili yok."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Kullanıcı takma adı"
 
@@ -2495,29 +2923,33 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "%s için yanlış resim türü"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "%s'de yanlış resim boyutu"
@@ -2525,7 +2957,9 @@ msgstr "%s'de yanlış resim boyutu"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr ""
 
@@ -2546,11 +2980,12 @@ msgid "You are already logged in!"
 msgstr "Zaten giriş yapmış durumdasıznız!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2569,7 +3004,7 @@ msgstr ""
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
@@ -2577,6 +3012,7 @@ msgstr ""
 "\"Sil\" düğmesine basarak hesabınızdan eklediğiniz OpenID'yi silebilirsiniz."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2585,7 +3021,8 @@ msgstr ""
 "Jabber/GTalk kullanarak durum mesaji gÖnderip alabilirsiniz. IM adres "
 "ayarlarinizi aşağıda yapın."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2596,21 +3033,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Yerel aboneliÄŸi kullanabilirsiniz!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Bize o profili yollamadınız"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2624,35 +3063,39 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr ""
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Harika, sizi tanıdık. Simdi yeni parolanızı girin."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "OpenID URLniz"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Bu sunucudaki takma adınız  veya kaydedilmiş eposta adresiniz."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2661,47 +3104,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) tek hesap ile bir çok siteye giriş yapmanızı "
 "sağlar. Hesabınızla bağlantılı OpenID'lerinizi burada yönetebilirsiniz."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "birkaç saniye önce"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "yaklaşık %d gün önce"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "yaklaşık %d saat önce"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "yaklaşık %d dakika önce"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "yaklaşık %d ay önce"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "yaklaşık bir gün önce"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "yaklaşık bir dakika önce"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "yaklaşık bir ay önce"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "yaklaşık bir yıl önce"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "yaklaşık bir saat önce"
 
@@ -2723,12 +3176,14 @@ msgid "reply"
 msgstr "cevapla"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "yukaridaki parola ile aynı"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr ""
 
@@ -2750,6 +3205,26 @@ msgstr "« Sonra"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2758,6 +3233,7 @@ msgid "This notice is not a favorite!"
 msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -2765,22 +3241,28 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2790,11 +3272,13 @@ msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2834,33 +3318,44 @@ msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr ""
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr ""
 
@@ -2914,6 +3409,11 @@ msgstr ""
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr ""
 
@@ -2942,6 +3442,8 @@ msgid "New password successfully saved. "
 msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2962,12 +3464,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2975,7 +3480,7 @@ msgstr ""
 msgid "No such message."
 msgstr ""
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
@@ -2999,51 +3504,70 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
@@ -3062,14 +3586,17 @@ msgid ""
 msgstr ""
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr ""
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr ""
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -3078,6 +3605,7 @@ msgid "Twitter Username"
 msgstr ""
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr ""
 
@@ -3086,24 +3614,29 @@ msgid "Twitter Password"
 msgstr ""
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -3114,33 +3647,43 @@ msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -3157,18 +3700,19 @@ msgid "The subscription has been rejected, but no "
 msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3178,89 +3722,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3268,11 +3834,11 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3287,7 +3853,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -3299,7 +3865,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3308,31 +3874,39 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr ""
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr ""
 
@@ -3345,14 +3919,19 @@ msgid "Twitter integration options"
 msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s ve arkadaşları"
@@ -3362,22 +3941,32 @@ msgid "You can upload your personal avatar."
 msgstr ""
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "Ayarlar"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
@@ -3394,35 +3983,44 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "Böyle bir durum mesajı yok."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr ""
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "Böyle bir kullanıcı yok."
@@ -3431,12 +4029,12 @@ msgstr "Böyle bir kullanıcı yok."
 msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 #, fuzzy
 msgid "You have already blocked this user."
 msgstr "Zaten giriş yapmış durumdasıznız!"
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3453,40 +4051,58 @@ msgstr ""
 msgid "Add to favorites"
 msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "Takma ad yok"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "Böyle bir durum mesajı yok."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3498,16 +4114,17 @@ msgstr ""
 "kullanılamaz. "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "Kullanıcı güncellenemedi."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 #, fuzzy
 msgid "Options saved."
 msgstr "Ayarlar kaydedildi."
@@ -3525,7 +4142,8 @@ msgstr ""
 msgid "Send me email when someone "
 msgstr ""
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3541,7 +4159,7 @@ msgstr ""
 "Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size "
 "mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3555,54 +4173,69 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "İçerik yok!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 #, fuzzy
 msgid "After"
 msgstr "« Sonra"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "Önce »"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3648,12 +4281,14 @@ msgstr ""
 msgid "Sync preferences"
 msgstr "Tercihler"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr ""
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "Böyle bir durum mesajı yok."
@@ -3668,7 +4303,8 @@ msgid "The most popular notices on the site right now."
 msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3682,15 +4318,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr ""
 
@@ -3698,12 +4336,14 @@ msgstr ""
 msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "Avatar güncellendi."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "Avatar güncellemede hata."
@@ -3723,7 +4363,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
@@ -3738,6 +4379,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "Yeni hesap oluÅŸtur"
@@ -3751,7 +4393,7 @@ msgstr ""
 "yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
 "karakterden oluşmalı. "
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "KiÅŸi Arama"
@@ -3775,21 +4417,21 @@ msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 msgid "A confirmation code was sent "
 msgstr "Onay kodu yok."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Zaten giriş yapmış durumdasıznız!"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Sunucuya yönlendirme yapılamadı: %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr ""
@@ -3798,16 +4440,19 @@ msgstr ""
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "Böyle bir durum mesajı yok."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "Bize o profili yollamadınız"
@@ -3816,21 +4461,25 @@ msgstr "Bize o profili yollamadınız"
 msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr ""
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "OpenID formu yaratılamadı: %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -3842,17 +4491,18 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "Avatar bilgisi kaydedilemedi"
 
-#  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Abonelik oluşturulamadı."
@@ -3866,12 +4516,15 @@ msgstr "Dosya çok büyük."
 msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 #, fuzzy
 msgid "Notice posted"
 msgstr "Durum mesajları"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr ""
 
@@ -3888,7 +4541,7 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "OpenID GiriÅŸi"
@@ -3916,11 +4569,13 @@ msgstr ""
 msgid "Service"
 msgstr "Ara"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
@@ -3930,17 +4585,18 @@ msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 msgid "Change your password."
 msgstr "Parolayı değiştir"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "Parola kaydedildi."
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Geçersiz bir eposta adresi."
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -3950,12 +4606,13 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "Profil bilinmiyor"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -3965,21 +4622,26 @@ msgid "Automatically subscribe to whoever "
 msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "%s Geçersiz başlangıç sayfası"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "Profil kaydedilemedi."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "Genel zaman çizgisi"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
@@ -4000,11 +4662,13 @@ msgstr "Genel Durum Akış RSS Beslemesi"
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4066,7 +4730,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "%s için cevaplar"
@@ -4076,53 +4741,74 @@ msgstr "%s için cevaplar"
 msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "Böyle bir durum mesajı yok."
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "Durum mesajları"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "Üyelik başlangıcı"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr ""
 
@@ -4137,7 +4823,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4148,32 +4834,39 @@ msgid "'s profile"
 msgstr "Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "Kullanıcının profili yok."
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr ""
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr ""
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "Abone olanlar"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr ""
 
@@ -4201,7 +4894,7 @@ msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "O onay kodu sizin için değil!"
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr ""
 
@@ -4210,7 +4903,6 @@ msgstr ""
 msgid "You are not subscribed to that profile."
 msgstr "Bize o profili yollamadınız"
 
-#  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
 #: actions/subedit.php:83
 #, fuzzy
 msgid "Could not save subscription."
@@ -4266,17 +4958,18 @@ msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
 msgid "These are the people whose "
 msgstr "%s adlı kullanıcının durumunu takip edenler"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "JabberID yok."
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4300,7 +4993,7 @@ msgstr ""
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4310,17 +5003,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "Avatar bilgisi kaydedilemedi"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4329,20 +5022,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "Böyle bir durum mesajı yok."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "İstek bulunamadı!"
@@ -4351,16 +5047,17 @@ msgstr "İstek bulunamadı!"
 msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 #, fuzzy
 msgid "Twitter password"
 msgstr "Yeni parola"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr ""
 
@@ -4373,156 +5070,165 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr "Eposta onayı silinemedi."
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "Kullanıcıyı kaydetmede hata oluştu."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "Yetkilendirme isteÄŸi yok!"
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr ""
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Aboneliği sonlandır"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr ""
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 #, fuzzy
 msgid "Upload an avatar"
 msgstr "Avatar güncellemede hata."
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr ""
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr ""
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Account"
 msgstr "Hakkında"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "Yeni hesap oluÅŸtur"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "Böyle bir OpenID yok."
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "Yardım"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "Yeni durum mesajı"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "Yeni durum mesajı"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Abonelikler"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "Böyle bir kullanıcı yok."
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr ""
 
@@ -4535,12 +5241,15 @@ msgstr ""
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "Yeni hesap oluÅŸtur"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 #, fuzzy
 msgid "Published"
 msgstr "Genel"
@@ -4562,35 +5271,40 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 "Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
 msgstr "Abonelikler"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4600,21 +5314,21 @@ msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 #, fuzzy
 msgid "Logo"
 msgstr "Çıkış"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
@@ -4647,12 +5361,12 @@ msgstr "GiriÅŸ"
 msgid "Leave"
 msgstr "Kaydet"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Geçersiz kullanıcı adı veya parola."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Yeni hesap oluÅŸtur"
@@ -4673,25 +5387,24 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 
-#: lib/mail.php:254
-#, fuzzy, php-format
+#: lib/mail.php:254 lib/mail.php:253
+#, php-format
 msgid "Location: %s\n"
 msgstr ""
 
-#  Belki Durum Merkezi falan denebilir mi ki?
-#: lib/mail.php:256
-#, fuzzy, php-format
+#: lib/mail.php:256 lib/mail.php:255
+#, php-format
 msgid "Homepage: %s\n"
 msgstr ""
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
@@ -4706,43 +5419,51 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "Yeni durum mesajı"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 veya daha fazla karakter"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 #, fuzzy
 msgid "in reply to"
 msgstr "...cevap olarak"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "cevapla"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr ""
 
@@ -4763,27 +5484,29 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Genel"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "KiÅŸi Arama"
@@ -4801,32 +5524,34 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Uzaktan abonelik"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Uzaktan abonelik"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Kullanıcının profili yok."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "Takip talebine izin verildi"
@@ -4840,11 +5565,12 @@ msgid "Top posters"
 msgstr ""
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 #, fuzzy
 msgid "Unblock this user"
 msgstr "Böyle bir kullanıcı yok."
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr ""
 
@@ -4852,22 +5578,2013 @@ msgstr ""
 msgid "Unsubscribe from this user"
 msgstr ""
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s ve arkadaşları"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar güncellendi."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "%s adli kullanicinin durum mesajlari"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"%%site.name%% üyeleri arasında isim, yer ya da ilgi alanları içinde arama "
+"yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
+"karakterden oluşmalı. "
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " \"%s\" için arama sonuçları"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
+"ve parolanızı tekrar giriniz."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Genel Durum Akış RSS Beslemesi"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Genel Durum Akış RSS Beslemesi"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Genel Durum Akış RSS Beslemesi"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
+"numarası."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Yarat"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "Profil"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profil ayarları"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "O onay kodu sizin için değil!"
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Eposta onayı silinemedi."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak için "
+"detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
+"bulunmadıysanız \"İptal\" tuşuna basın. "
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"Eğer zaten bir hesabınız varsa, kullanıcı adınız ve parolanız ile giriş "
+"yapıp hesabınızı OpenID'nize bağlayabilirsiniz."
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s %2$s durum mesajlarınızı takip etmeye başladı.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Kendisini durumsuz bırakmayın!,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Ara"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Böyle bir belge yok."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Sunucuya yönlendirme yapılamadı: %s"
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Kullanıcının profili yok."
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s ve arkadaşları"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Yer"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "%s Geçersiz başlangıç sayfası"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Takma ad kullanımda. Başka bir tane deneyin."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Avatar bilgisi kaydedilemedi"
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Yeni durum mesajı"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Yeni durum mesajı"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Geçersiz bir takma ad."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Kullanıcının profili yok."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Bize o profili yollamadınız"
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Tercihler kaydedildi."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Sonuç yok"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Kullanıcının profili yok."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+msgid "Message sent"
+msgstr ""
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Profil kaydedilemedi."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) tek hesap ile bir çok siteye giriş yapmanızı "
+"sağlar. Hesabınızla bağlantılı OpenID'lerinizi burada yönetebilirsiniz."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profil ayarları"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Eğer parolanızı unuttuysanız veya kaybettiyseniz, hesabınıza eklemiş "
+"olduğunuz eposta adresine yeni bir tane gönderilmesini sağlayabilirsiniz."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Harika, sizi tanıdık. Simdi yeni parolanızı girin."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Parola geri alma isteÄŸi"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Onay kodu hatası."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Takip talebine izin verildi"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s'in %2$s'deki durum mesajları "
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "%s adli kullanicinin durum mesajlari"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Bütün abonelikler"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profil ayarları"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Bize o profili yollamadınız"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Durum mesajını kaydederken hata oluştu."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Kullanıcının profili yok."
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profil"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Yükle"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Parolayı değiştir"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "BaÄŸlan"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Ara"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "GiriÅŸ"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Böyle bir kullanıcı yok."
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Böyle bir kullanıcı yok."
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "İçerik yok!"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Ara"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Sunucuya yönlendirme yapılamadı: %s"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Zaten giriş yapmış durumdasıznız!"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Sunucuya yönlendirme yapılamadı: %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Bize o profili yollamadınız"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "OpenID formu yaratılamadı: %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Profil"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Bize o profili yollamadınız"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar güncellendi."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Desteklenmeyen görüntü dosyası biçemi."
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "%s adli kullanicinin durum mesajlari"
+
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "YetkilendirilmemiÅŸ."
+
+#: actions/finishremotesubscribe.php:109
+msgid "Could not convert request token to access token."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:114
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Yeni hesap oluÅŸtur"
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "OMB protokolünün bilinmeğen sürümü."
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Eposta onaylanamadı."
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Böyle bir durum mesajı yok."
 
-#~ msgid "Email address"
-#~ msgstr "Eposta adresi"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Böyle bir durum mesajı yok."
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Durum gönderilirken hata oluştu"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "%s adli kullanicinin durum mesajlari"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok mu? Ne "
+"duruyorsunuz, hemen bir [yeni hesap oluÅŸturun](%%action.register%%) ya da "
+"[OpenID](%%action.openidlogin%%) ile giriş yapın."
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "%s adli kullanicinin durum mesajlari"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "BaÄŸlan"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Geçersiz profil adresi (YADIS belgesi yok)."
+
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
+msgstr ""
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "%s için cevaplar"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "%s için durum RSS beslemesi"
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "Eğer parolanızı unuttuysanız veya kaybettiyseniz, hesabınıza eklemiş "
-#~ "olduğunuz eposta adresine yeni bir tane gönderilmesini sağlayabilirsiniz."
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Durum mesajları"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak için "
+"detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
+"bulunmadıysanız \"İptal\" tuşuna basın. "
+
+#: actions/userauthorization.php:249
+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:261
+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:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Avatar URLi '%s' okunamıyor"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "%s için yanlış resim türü"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Sunucuya yönlendirme yapılamadı: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Yeni durum mesajı"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Kullanıcı güncellenemedi."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "%s için cevaplar"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Durum mesajını kaydederken hata oluştu."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Onay kodu yok."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Yeni durum mesajı"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Kullanıcı güncellenemedi."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Yeni durum mesajı"
diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo
index e08dc4e9c..a3a9b117b 100644
--- a/locale/uk/LC_MESSAGES/statusnet.mo
+++ b/locale/uk/LC_MESSAGES/statusnet.mo
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 55cea21c3..c9301425b 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -1,33 +1,29 @@
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of StatusNet to Ukrainian
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-12 16:19+0000\n"
-"Last-Translator: Evan Prodromou <evan@status.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:43+0000\n"
+"Language-Team: Ukrainian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-"X-Poedit-Language: Ukrainian\n"
-"X-Poedit-Country: UKRAINE\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Потік пошуку дл� \"%s\""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -40,17 +36,19 @@ msgid " from "
 msgstr " від "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Оновленні відповіді %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s запро�ив(ла) ва� приєднати�� до нього(неї) на %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -109,6 +107,7 @@ msgstr ""
 "Щиро ваші, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s тепер �лідкує за вашими повідомлен�ми на %2$s."
@@ -131,25 +130,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s оновив(ла) цю відповідь на оновленн� від %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s має �тату� на %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Загальний потік"
@@ -159,34 +161,48 @@ msgstr "%s Загальний потік"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s з друз�ми"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s загальна хронологі�"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s �тату�"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s хронологі�"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s оновленн� від в�іх!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -194,16 +210,18 @@ msgstr ""
 "(Ви маєте негайно отримати ли�та електронною поштою, в �кому знаходитимуть�� "
 "ін�трукції щодо підтвердженн� вашої електронної адре�и.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** це �ерві� мікроблогів наданий вам "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** це �ерві� мікроблогів наданий вам [%%site.broughtby%%](%%"
+"site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** це �ерві� мікроблогів. "
@@ -216,32 +234,37 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 літери нижнього регі�тра і цифри, ні�кої пунктуації або інтервалів"
+msgstr ""
+"1-64 літери нижнього регі�тра і цифри, ні�кої пунктуації або інтервалів"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 літери нижнього регі�тра і цифри, ні�кої пунктуації або інтервалів. "
 "�еодмінно."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 або більше знаків"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 або більше знаків, і не забудьте їх!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 або більше знаків. �еодмінно."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -251,6 +274,7 @@ msgstr ""
 "затведити %s дл� відправленн� вам повідомлень."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -285,7 +309,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API метод не знайдено!"
 
@@ -308,16 +359,23 @@ msgstr "API метод не знайдено!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "API метод наразі знаходить�� у розробці."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Про"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Погодити�ь"
 
@@ -328,6 +386,9 @@ msgstr "Погодити�ь"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Додати"
 
@@ -345,28 +406,30 @@ msgstr "Додати або вилучити адре�и OpenID"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "�дре�а"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 "�дре�и друзів куди над�илатимуть�� запрошенн� (кожна адре�а окремим р�дком)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "В�і підпи�ки"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "В�і оновленн� дл� %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "В�і оновленн� за збігом з \"%s\""
@@ -376,32 +439,39 @@ msgstr "В�і оновленн� за збігом з \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "Тепер ви підпи�ані!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ви впевненні, що бажаєте видалити це повідомленн�?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "�вторизувати підпи�ку"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "�втоматично входити у майбутньому; не дл� комп'ютерів загального "
 "кори�туванн�!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -411,15 +481,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "�ватара"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "�ватару оновлено."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -430,6 +504,7 @@ msgstr ""
 "�пи�ку контактів?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -438,7 +513,7 @@ msgstr ""
 "�памом також!), там має бути повідомленн� з подальшими ін�трукці�ми."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очікуванн� підтвердженн� телефонного номера."
 
@@ -449,6 +524,8 @@ msgstr "�азад »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Про �ебе"
 
@@ -456,16 +533,18 @@ msgstr "Про �ебе"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Ви перевищили ліміт (140 знаків це мак�имум)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "�е можна видалити це повідомленн�."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "�е можна прочитати URL аватари '%s'"
@@ -473,6 +552,8 @@ msgstr "�е можна прочитати URL аватари '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "�е можна зберегти новий пароль."
 
@@ -480,31 +561,34 @@ msgstr "�е можна зберегти новий пароль."
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Ска�увати"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "�е можна підтвердити �поживчий об'єкт OpenID."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "�е можна полагодити цей Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "�е можна полагодити цю поштову адре�у"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Змінити"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "Змінити електронну адре�у вручну"
 
@@ -514,11 +598,12 @@ msgid "Change password"
 msgstr "Змінити пароль"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Змінити ваш пароль"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Змінити налаштуванн� профілю"
 
@@ -528,6 +613,9 @@ msgstr "Змінити налаштуванн� профілю"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Підтвердити"
 
@@ -540,12 +628,14 @@ msgstr "Підтвердити адре�у"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Підтвердженн� �ка�овано."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "Код підтвердженн�"
 
@@ -554,7 +644,8 @@ msgstr "Код підтвердженн�"
 msgid "Confirmation code not found."
 msgstr "Код підтвердженн� не знайдено."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -589,20 +680,24 @@ msgstr ""
 "�ерві�."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "З'єднанн�"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "З'єднати�ь викори�товуючи і�нуючий рахунок"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Контакт"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "�е вдало�� �творити форму OpenID: %s"
@@ -610,35 +705,39 @@ msgstr "�е вдало�� �творити форму OpenID: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "�е вдало�� додати кори�тувача: %s вже при�утній у вашому �пи�ку."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "�е вдало�� додати кори�тувача: кори�тувача не знайдено."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "�евдале перенаправленн� на �ервер: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "�е вдало�� зберегти інформацію про аватару"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "�е вдало�� зберегти інформацію про новий профіль"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "�е вдало�� підпи�ати іншого до ва�."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "�евдала підпи�ка."
 
@@ -658,15 +757,17 @@ msgstr "Ð�е вдалоÑ�Ñ� перетворити токени запиту нÐ
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "�е вдало�� видалити підтвердженн� поштової адре�и."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "�е вдало�� видалити підпи�ку."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Жодних �тату�ів не ви�влено."
 
@@ -679,29 +780,38 @@ msgstr "�е вдало�� отримати токен запиту."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "�е вдало�� додати код підтвердженн�."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "�е вдало�� додати нову підпи�ку."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "�е вдало�� зберегти профіль."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "�е вдало�� оновити кори�тувача дл� автопідпи�ки."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "�е вдало�� оновити запи� кори�тувача."
 
@@ -717,42 +827,48 @@ msgstr "�е вдало�� оновити запи� кори�тувача."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "�е вдало�� оновити кори�тувача."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Створити"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Створити нового кори�тувача з цим ім'�м."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Створити новий рахунок"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Створенн� нового рахунку дл� OpenID, �ким ви вже кори�туєте�ь."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Поточна підтверджена адре�а Jabber/GTalk."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Поточний підтверджений телефонний номер."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "Поточна підтверджена поштова адре�а."
 
@@ -761,23 +877,27 @@ msgid "Currently"
 msgstr "Поточне"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Помилка бази даних при додаванні тегу: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Помилка бази даних при додаванні відповіді: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Видалити повідомленн�"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Опишіть �ебе та �вої інтере�и (140 знаків)"
 
@@ -785,11 +905,13 @@ msgstr "Опишіть �ебе та �вої інтере�и (140 знаків
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Пошта"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "Електронна адре�а"
 
@@ -799,39 +921,43 @@ msgid "Email Settings"
 msgstr "�алаштуванн� пошти"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "Ц� адре�а вже викори�товуєть��."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Підтвердженн� електронної адре�и"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Електронна адре�а, на зразок \"UserName@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "Електронні адре�и"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Введіть ім'� або електронну адре�у."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Введіть код, �кий ви отримали телефоном."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Помилка токена авторизації"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Помилка при підключенні кори�тувача до OpenID."
 
@@ -842,39 +968,46 @@ msgstr "Помилка при підключенні кори�тувача."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Помилка при додаванні аватари"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Помилка при додаванні нового профілю"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Помилка при додаванні віддаленого профілю"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Помилка при збереженні підтвердженн� адре�и."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Помилка при збереженні віддаленого профілю"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Помилка при збереженні профілю."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Помилка при збереженні кори�тувача."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Помилка при збереженні кори�тувача; недій�ний."
 
@@ -883,6 +1016,9 @@ msgstr "Помилка при збереженні кориÑ�тувача; неÐ
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Помилка в налаштуванн�х кори�тувача."
 
@@ -893,6 +1029,7 @@ msgstr "Помилка при оновленні профілю"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Помилка при оновленні віддаленого профілю"
 
@@ -902,33 +1039,36 @@ msgid "Error with confirmation code."
 msgstr "Помилка з кодом підтвердженн�."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "І�нуюче ім'�"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "ЧаПи"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Оновленн� аватари невдале."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Живленн� дл� друзів %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Живленн� дл� відповідей %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "Живленн� дл� тегів %s"
@@ -943,7 +1083,7 @@ msgstr "Знайти за змі�том повідомлень"
 msgid "Find people on this site"
 msgstr "Знайти людей на цьому �айті"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -956,6 +1096,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Повне ім'�"
 
@@ -964,23 +1109,33 @@ msgstr "Повне ім'�"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Повне ім'� задовге (255 знаків мак�имум)"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Допомога"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Дім"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Веб-�торінка"
 
@@ -988,21 +1143,27 @@ msgstr "Веб-�торінка"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Веб-�торінка має недій�ну URL-адре�у."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Я хочу над�илати повідомленн� поштою."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "ІМ"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "�дре�а IM"
 
@@ -1012,7 +1173,7 @@ msgid "IM Settings"
 msgstr "�алаштуванн� IM"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1020,7 +1181,7 @@ msgstr ""
 "Якщо ви вже маєте рахунок, увійдіть викори�товуючи ім'� та пароль, щоб "
 "приєднати їх до вашого OpenID."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1028,7 +1189,7 @@ msgstr ""
 "Якщо ви бажаєте додати OpenID до вашого рахунку, введіть адре�у в поле нижче "
 "і нати�ніть \"Додати\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1040,25 +1201,31 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "Вхідна пошта"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "�дре�у вхідної пошти видалено."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Старий пароль неточний"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "�еточне ім'� або пароль."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1067,30 +1234,31 @@ msgstr ""
 "вказали у налаштуванн�х вашого профілю."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "�едій�на URL-адре�а аватари '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "�едій�на електронна адре�а: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "�едій�на веб-�торінка '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "�едій�на ліцензі� URL '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "�едій�ний змі�т повідомленн�"
 
@@ -1105,13 +1273,13 @@ msgid "Invalid notice url"
 msgstr "�едій�на URL-адре�а повідомленн�"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "�едій�на URL-адре�а профілю '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "�едій�на URL-адре�а профілю (неправильний формат)"
 
@@ -1129,28 +1297,35 @@ msgstr "�едій�ний розмір."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "�едій�не ім'� або пароль."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Запрошенн� віді�лано"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Запрошенн� були наді�лани на�тупним о�обам:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Запро�ити"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Запро�ити нових кори�тувачів"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1162,11 +1337,12 @@ msgstr ""
 "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID вже належить іншому кори�тувачу."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1177,22 +1353,31 @@ msgstr ""
 "GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Мова"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "Мова задовга (50 знаків мак�имум)"
 
-# "Мі�цезнаходженн�", �к на мене забагато літер. "Локаці�" - не менш вживане в україн�ькій мові �лово.
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 #: actions/profilesettings.php:85 actions/register.php:187
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Локаці�"
 
@@ -1201,7 +1386,12 @@ msgstr "Локаці�"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Локаці� надто довга (255 знаків мак�имум)"
 
@@ -1210,18 +1400,22 @@ msgstr "Локаці� надто довга (255 знаків мак�имум)
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "Увійти"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Увійти з [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1229,25 +1423,29 @@ msgid ""
 "%). "
 msgstr ""
 "Увійти викри�товуючи ім'� та пароль. Ще не маєте імені кори�тувача? "
-"[Зареє�трувати](%%action.register%%) новий акаунт, або �пробувати "
-"[OpenID](%%action.openidlogin%%). "
+"[Зареє�трувати](%%action.register%%) новий акаунт, або �пробувати [OpenID](%%"
+"action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Вийти"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Довше ім'�, переважно ваше \"�правжнє\" ім'�"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Загубили або забули пароль?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Створити нову адре�у дл� над�иланн� повідомлень; видалити �тару."
 
@@ -1258,16 +1456,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Зазначте, �к �амо ви бажаєте отримувати ли�ти з %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "З нами від"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Мікроблог від %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1280,42 +1480,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Мої повідомленн� та файли до�тупні під "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "�ове"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "�ова електронна адре�а дл� над�иланн� повідомлень на %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "�ову адре�у дл� вхідних повідомлень додано."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "�ове ім'�"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "�ове повідомленн�"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "�овий пароль"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "�овий пароль у�пішно збережено. Тепер ви увійшли."
 
@@ -1325,7 +1533,13 @@ msgstr "�овий пароль у�пішно збережено. Тепер в
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Ім'� кори�тувача"
 
@@ -1334,7 +1548,12 @@ msgstr "Ім'� кори�тувача"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім'� вже викори�товуєть��. Спробуйте інше."
 
@@ -1343,49 +1562,60 @@ msgstr "Це ім'� вже викори�товуєть��. Спробуйте
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Ім'� кори�тувача повинно �кладати�ь з літер нижнього регі�тру і цифр, ні�ких "
 "інтервалів."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Таке ім'� неприпу�тиме."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Ім'� кори�тувача, за �ким ви бажаєте �лідувати"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Ім'� або електронна адре�а"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "�і"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "�емає Jabber ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "�емає запиту на авторизацію!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "Оператора не обрано."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Код не введено"
 
@@ -1397,11 +1627,15 @@ msgstr "�емає коду підтвердженн�."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "�емає змі�ту!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "�емає електронної адре�и."
 
@@ -1410,7 +1644,9 @@ msgid "No id."
 msgstr "�емає ID."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "�емає адре�и дл� вхідної пошти."
 
@@ -1421,6 +1657,7 @@ msgstr "Ð�а віддаленому Ñ�ервері такого імені неÐ
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "�емає імені."
 
@@ -1428,12 +1665,14 @@ msgstr "�емає імені."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "�е очікуєть�� підтвердженн� дл� �ка�уванн�."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "�емає телефонного номера."
 
@@ -1443,7 +1682,8 @@ msgid "No profile URL returned by server."
 msgstr "�емає URL-адре�и профілю, �ку б було повернуто �ервером."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Дл� цього кори�тувача немає зареє�трованої електронної адре�и."
 
@@ -1455,7 +1695,7 @@ msgstr "Відповідей на запит немає!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "�емає результатів"
 
@@ -1466,12 +1706,16 @@ msgstr "�емає розміру."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Жодних �тату�ів з таким ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "�е знайдено жодних �тату�ів з таким ID."
 
@@ -1481,13 +1725,15 @@ msgid "No such OpenID."
 msgstr "Такого OpenID немає."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Такого документа немає."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Такого повідомленн� немає."
 
@@ -1525,12 +1771,22 @@ msgstr "�емає такої підпи�ки"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Такого кори�тувача немає."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "Кори�тувача з такою електронною адре�ою або ім'�м немає."
 
@@ -1544,33 +1800,38 @@ msgid "Not a recovery code."
 msgstr "Це не код оновленн�."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Це не зареє�трований кори�тувач."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Такий формат даних не підтримуєть��."
 
-# "Invalid" та "Not a valid" � умовно по�тавив знак рівн�нн� між ними, тому перекладаю �к "недій�ний", замі�ть "не дій�ний". Це не помилка.
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Це недій�ний Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "Це недій�ний OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "Це недій�на електронна адре�а"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "Це недій�на електронна адре�а."
 
@@ -1578,6 +1839,11 @@ msgstr "Це недій�на електронна адре�а."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Це недій�не ім'� кори�тувача."
 
@@ -1597,7 +1863,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Це недій�на URL-адре�а профілю (немає документа YADIS)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "Це не зображенн�, або файл зіп�овано."
 
@@ -1608,11 +1875,13 @@ msgstr "�е авторизовано."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Ц� відповідь не очікуєть��!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "�е знайдено"
 
@@ -1628,11 +1897,15 @@ msgstr "�е знайдено"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "�е увійшли."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "�е підпи�ано!."
 
@@ -1649,39 +1922,44 @@ msgid "Notice feed for %s"
 msgstr "Живленн� повідомлень дл� %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Повідомленн� не має профілю"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Повідомленн�"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Повідомленн� позначені з %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Старий пароль"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "У�тановки рахунку OpenID"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "�втопідтвердженн� OpenID"
 
@@ -1689,29 +1967,34 @@ msgstr "�втопідтвердженн� OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "Вхід OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "URL-адре�а OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "Ідентифікацію OpenID �ка�овано."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Ідентифікаці� OpenID невдала: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "�евдача OpenID: %s"
@@ -1727,11 +2010,12 @@ msgid "OpenID settings"
 msgstr "�алаштуванн� OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Можна додати пер�ональне повідомленн� до запрошенн� (опціонально)."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Ча�ткове завантаженн�."
 
@@ -1741,34 +2025,46 @@ msgstr "Ча�ткове завантаженн�."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Пароль"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Пароль та підтвердженн� не �півпадають."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Пароль має �кладати�ь з 6-ти або більше знаків."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Запит на відновленн� паролю відправлено."
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "Пароль збережено."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Паролі не �півпадають."
 
@@ -1788,14 +2084,17 @@ msgid "People search"
 msgstr "Пошук людей"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "О�оби�те"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "О�оби�ті повідомленн�"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Телефонний номер та регіональний код, ні�кої пунктуації чи інтервалів"
 
@@ -1810,7 +2109,7 @@ msgstr ""
 "підпи�увати�ь ні на чиї повідомленн�, про�то нати�ніть \"Відмінити\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 "�ад�илати повідомленн� на �айт, коли мій �тату� Jabber/GTalk змінюєть��."
@@ -1820,7 +2119,9 @@ msgstr ""
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Преференції"
 
@@ -1829,42 +2130,52 @@ msgstr "Преференції"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Преференції збережно."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Мова, �кій надаєте перевагу"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Конфіденційні�ть"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Проблема при збереженні повідомленн�."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Профіль"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "URL-адре�а профілю"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "�алаштуванн� профілю"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "�евідомий профіль"
 
@@ -1873,17 +2184,19 @@ msgid "Public Stream Feed"
 msgstr "Живленн� загального потоку"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Загальна хронологі�"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Позначати міткою MicroID мою адре�у Jabber/GTalk."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Позначати міткою MicroID мою електронну адре�у."
 
@@ -1893,12 +2206,14 @@ msgid "Recent Tags"
 msgstr "�ові теги"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Відновити"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Відновити пароль"
 
@@ -1911,37 +2226,45 @@ msgstr "Код відновленн� дл� невідомого кори�ту
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Реє�траці�"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "Реє�трацію не дозволено."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "Реє�траці� у�пішна"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Забраковано"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Пам'�тати мене"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Віддалений профіль не �півпадає з цим профілем"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "Віддалена підпи�ка"
 
@@ -1955,6 +2278,9 @@ msgstr "Віддалена підпи�ка"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Видалити"
 
@@ -1963,7 +2289,7 @@ msgstr "Видалити"
 msgid "Remove OpenID"
 msgstr "Видалити OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1972,34 +2298,41 @@ msgstr ""
 "увійти знову! Перед тим �к видалити його, з початку додайте інший."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Відповіді"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Відповіді до %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Скинути"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Скинути пароль"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "СМС"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "Телефонний номер"
 
@@ -2008,17 +2341,18 @@ msgstr "Телефонний номер"
 msgid "SMS Settings"
 msgstr "�алаштуванн� СМС"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "Підтвердженн� СМС"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Такий �амо, �к і пароль вище"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Такий �амо, �к і пароль вище. �еодмінно."
 
@@ -2031,12 +2365,21 @@ msgstr "Такий �амо, �к і пароль вище. �еодмінно."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Зберегти"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Пошук"
 
@@ -2046,7 +2389,7 @@ msgid "Search Stream Feed"
 msgstr "Живленн� потоку пошуку"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2055,7 +2398,7 @@ msgstr ""
 "Пошук повідомлень на %%site.name%% за їх змі�том. Відокремлюйте пошукові "
 "умови інтервалами; вони повинні �кладати�ь з 3 знаків або більше."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2066,34 +2409,38 @@ msgstr ""
 "або більше."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Оберіть оператора"
 
-# Слово "�аді�лати" у вузьку рамку веб-форми відправленн� повідомлень на �айті не вти�каєть��. Гадаю "Так!" цілком прийн�тний замінник.
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Так!"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "�ад�илайте ли�ти на цю адре�у і їх буде опубліковано на �айті."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Поівдомл�ти мене поштою про нові підпи�ки."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Повідомл�ти мене через Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2102,17 +2449,20 @@ msgstr ""
 "витрати від мого мобільного оператора."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "�ад�илати також мені відповіді через Jabber/GTalk від людей, до �ких � не "
 "підпи�аний."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "�алаштуванн�"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "�алаштуванн� збережено."
 
@@ -2132,28 +2482,33 @@ msgid "Something weird happened."
 msgstr "Стало�� що�ь дивне."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 "Вибачте, але не затверджено жодної електронної адре�и дл� вхідної пошти."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Вибачте, але це не є вашою електронною адре�ою дл� входної пошти."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Джерело"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Стати�тика"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Збережений OpenID не знайдено."
 
@@ -2161,24 +2516,28 @@ msgstr "Збережений OpenID не знайдено."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Підпи�ати�ь"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Підпи�чики"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "Підпи�ку авторизовано"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Підпи�ку �кинуто"
 
@@ -2186,28 +2545,35 @@ msgstr "Підпи�ку �кинуто"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Підпи�ки"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Си�тема відповіла помилкою при завантаженні цього файла."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Теги"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Тек�т"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Пошук тек�ту"
 
@@ -2227,6 +2593,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Цей код підтвердженн� не дл� ва�!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "Ц� електронна адре�а належить іншому кори�тувачу."
 
@@ -2236,63 +2603,73 @@ msgid "That file is too big."
 msgstr "Цей файл надто великий."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Це і так вже ваш Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "Це і так вже ваша адре�а."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "Це і так вже ваш телефонний номер."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Це не ваш Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "Це не ваша адре�а."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "Це не ваш телефонний номер."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Це помилкова адре�а IM."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "Це помилковий код підтвердженн�."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "Цей телефонний номер належить іншому кори�тувачу."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "�адто довго. Мак�имальний розмір повідомленн� 140 знаків."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "�адто довго. Мак�имальний розмір повідомленн� 255 знаків."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "�дре�у \"%s\" було підтверджено дл� вашого рахунку."
@@ -2301,11 +2678,14 @@ msgstr "Ð�дреÑ�у \"%s\" було підтверджено длÑ� вашогÐ
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "�дре�у було видалено."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2315,7 +2695,8 @@ msgstr ""
 "Звірте�ь з ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к "
 "авторизувати підпи�ку. Ваш підпи�ний токен:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2326,33 +2707,38 @@ msgstr ""
 "підпи�ку."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Тут пред�тавлені ті, хто �лідкує за повідомленн�ми від %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Тут пред�тавлені ті, хто �лідкує за вашими повідомленн�ми."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Тут пред�тавлені ті, за чиїми повідомленн�ми �лідкує %s."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Тут пред�тавлені ті, за чиїми повідомленн�ми ви �лідкуєте."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr "Ці люди вже є кори�тувачами і ва� було автоматично підпи�ано до них:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Цей код підтвердженн� за�тарілий. Будь ла�ка, розпочніть �початку."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2362,7 +2748,7 @@ msgstr ""
 "вашого OpenID провайдера."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2377,6 +2763,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Цей метод потребує або ��ПИС�ТИ, або ВИД�ЛИТИ."
 
@@ -2385,49 +2774,63 @@ msgstr "Цей метод потребує або Ð�Ð�ПИСÐ�ТИ, або ВИÐ
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Цей метод потребує ��ПИС�ТИ."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Ц� �торінка не до�тупна дл� того типу медіа, з �ким ви погодили�ь"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Ча�овий по��"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "Ча�овий по�� не обрано."
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: 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 ""
-"Щоб підпи�ати�ь, ви можете [увійти](%%action.login%%), або "
-"[зареє�трувати](%%action.register%%) новий  рахунок. Якщо ви вже маєте "
-"рахунок  на [�умі�ному �айті](%%doc.openmublog%%),  введіть URL-адре�у "
-"вашого профілю нижче."
+"Щоб підпи�ати�ь, ви можете [увійти](%%action.login%%), або [зареє�трувати](%%"
+"action.register%%) новий  рахунок. Якщо ви вже маєте рахунок  на [�умі�ному "
+"�айті](%%doc.openmublog%%),  введіть URL-адре�у вашого профілю нижче."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Два ID або імені_у_мережі повинні підтримувати�ь."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL-адре�а вашої веб-�торінки, блогу, або профілю на іншому �айті"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL-адре�а вашого профілю на іншому �умі�ному �ерві�і"
 
@@ -2439,15 +2842,22 @@ msgstr "URL-адреÑ�а вашого профілю на іншому Ñ�уміÑ
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "�е�подіване пред�тавленн� форми."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "�е�подіване �киданн� паролю."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Ді� невідома"
 
@@ -2478,38 +2888,47 @@ msgstr "Відпи�ати�ь"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Вер�і� OMB не підтримуєть��"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Формат зображенн� не підтримуєть��."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Оновленн� через SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Оновленн� за допомогою �лужби миттєвих повідомлень (ІМ)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Оновленн� від %1$s та друзів на %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Оновленн� від %1$s на %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Завантажити"
 
@@ -2520,8 +2939,8 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Завантажити нову \"аватару\" (зображенн� кори�тувача) можна тут. Ви не зможете "
-"відредагувати �вою аватару пі�л� завантаженн�, так що �початку "
+"Завантажити нову \"аватару\" (зображенн� кори�тувача) можна тут. Ви не "
+"зможете відредагувати �вою аватару пі�л� завантаженн�, так що �початку "
 "переконайте�ь, що вона має більш-менш квадратну форму. Ваше зображенн� "
 "зберігатиметь�� під ліцензією �айту, також. Викори�товуйте зображенн�, �кі "
 "належать вам, і �кі ви можете вільно демон�трувати."
@@ -2531,6 +2950,7 @@ msgid "Upload a new profile image"
 msgstr "Завантажити нове зображенн� кори�тувача"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -2538,7 +2958,9 @@ msgstr ""
 "�ерві�у."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Викори�товуєть�� лише дл� оновлень, оголошень та відновленн� паролю"
 
@@ -2562,11 +2984,16 @@ msgstr "Кори�тувача, �кий �лідкував за вашими п
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Кори�тувач не має профілю."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Ім'� кори�тувача"
 
@@ -2575,29 +3002,33 @@ msgid "User not found."
 msgstr "Кори�тувача не знайдено."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "За �ким ча�овим по��ом ви живете?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Що нового, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Де ви живете, на зразок \"Мі�то, обла�ть (регіон), країна\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "�еправильний тип зображенн� дл� '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "�еправильний розмір зображенн� '%s'"
@@ -2605,7 +3036,9 @@ msgstr "�еправильний розмір зображенн� '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Так"
 
@@ -2628,11 +3061,12 @@ msgid "You are already logged in!"
 msgstr "Ви вже в �и�темі!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Ви вже підпи�ані до цих кори�тувачів:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "Ви не є друз�ми із вказаним кори�тувачем."
 
@@ -2650,15 +3084,16 @@ msgstr "Ви можете Ñ�творити новий рахунок, щоб пÐ
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Ви можете отримувати СМС через електронну пошту від %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Ви можете видалити OpenID із �вого рахунку, �кщо нати�нете кнопку "
-"\"Видалити\"."
+"Ви можете видалити OpenID із �вого рахунку, �кщо нати�нете кнопку \"Видалити"
+"\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2668,7 +3103,8 @@ msgstr ""
 "миттєвих повідомлень](%%doc.im%%). Вкажить �вою адре�у і налаштуйте опції "
 "нижче."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2679,21 +3115,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Ви можете кори�тувати�ь локальними підпи�ками!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Ви не зможете зареє�трувати�ь, �кщо не погодите�ь з умовами ліцензії."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Ви не над�илали нам цього профілю"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2715,16 +3153,19 @@ msgstr ""
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Ви не можете видалити �тату� іншого кори�тувача."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "Ви маєте �початку увійти, аби мати змогу запро�ити кого�ь до %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2732,70 +3173,81 @@ msgstr ""
 "Ва� буде поінформовано, коли запрошені вами о�оби погод�ть�� з запрошенн�ми "
 "і зареє�трують�� на �айті. Д�куємо, що �при�єте формуванню �пільноти!"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Ва� ідентифіковано. Введіть  новий пароль нижче. "
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "URL-адре�а вашого OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Ваше ім'� кори�тувача на цьому �ервері, або зареє�трована електронна адре�а."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) дає вам можливі�ть реє�трувати�� на багатьох �айтах "
-" кори�туючи�ь єдиним рахунком.  Керувати вашими OpenID можна звід�и."
+"[OpenID](%%doc.openid%%) дає вам можливі�ть реє�трувати�� на багатьох "
+"�айтах  кори�туючи�ь єдиним рахунком.  Керувати вашими OpenID можна звід�и."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "мить тому"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "близько %d днів тому"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "близько %d годин тому"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "близько %d хвилин тому"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "близько %d мі��ців тому"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "день тому"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "хвилину тому"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "мі��ць тому"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "рік тому"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "годину тому"
 
@@ -2817,12 +3269,14 @@ msgid "reply"
 msgstr "відпові�ти"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "такий �амо, �к і пароль вище"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "тип файлу не підтримуєть��"
 
@@ -2843,6 +3297,26 @@ msgstr "« Вперед"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Виникли певні проблеми з токеном поточної �е�ії. Спробуйте знов, будь ла�ка."
@@ -2852,6 +3326,7 @@ msgid "This notice is not a favorite!"
 msgstr "Це повідомленн� не є обраним!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "�е можна видалити зі �пи�ку обраних."
 
@@ -2859,23 +3334,29 @@ msgstr "�е можна видалити зі �пи�ку обраних."
 msgid "Favor"
 msgstr "Обрати"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "�ад�илати мені ли�та, коли хто�ь додає моє повідомленн� до �пи�ку обраних."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "�ад�илати мені ли�та, коли хто�ь шле приватне повідомленн� дл� мене."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Це повідомленн� вже є обраним!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "�е можна позначити �к обране."
 
@@ -2885,11 +3366,13 @@ msgstr "�е обране"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "Обрані повідомленн� %s"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Живленн� дл� обраних повідомлень від %s"
@@ -2932,23 +3415,32 @@ msgid "Login with your username and password. "
 msgstr "Увійти з вашим ім'�м та паролем. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "�адто довго. Мак�имальний розмір 140 знаків."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Жодного отримувача не визначено."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "Ви не можете наді�лати повідомленн� цьому кори�тувачеві."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2956,11 +3448,13 @@ msgstr ""
 "вголо�."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "�емає такого кори�тувача"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "�ове повідомленн�"
 
@@ -3016,6 +3510,11 @@ msgstr "Ви можете оновити влаÑ�ну перÑ�ональну Ñ–Ð
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "Кори�тувач з невідповідним профілем"
 
@@ -3044,6 +3543,8 @@ msgid "New password successfully saved. "
 msgstr "�овий пароль у�пішно збережено. "
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "Пароль має �кладати�ь з 6-ти або більше знаків."
 
@@ -3066,12 +3567,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "�би підпи�ати�ь, ви можете [увійти](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Живленн� дл� обраних повідомлень від %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "�е можна відновити обрані повідомленн�."
 
@@ -3079,7 +3583,7 @@ msgstr "�е можна відновити обрані повідомленн�
 msgid "No such message."
 msgstr "�емає такого повідомленн�."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "Лише відправник та отримувач мають можливі�ть читати це повідомленн�."
 
@@ -3103,52 +3607,71 @@ msgid "Mobile carrier for your phone. "
 msgstr "Оператор мобільного зв'�зку. "
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Пр�ме повідомленн� до %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "В�і пр�мі повідомленн� наді�лані до %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "Пр�мі повідомленн� наді�лані вами"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "В�і пр�мі повідомленн� наді�лані від %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "Повідомленн� без тек�ту!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "Отримувача не знайдено."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "�е можна наді�лати пр�ме повідомленн� кори�тувачеві, �кий не є вашим другом."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Обрані від %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s оновленн� обраних від %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s додав(ла) ваше повідомленн� до обраних"
@@ -3160,8 +3683,8 @@ msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
-"%1$s щойно позначив(ла) ваше повідомленн� від %2$s �к одне з обраних "
-"ним(нею)\n"
+"%1$s щойно позначив(ла) ваше повідомленн� від %2$s �к одне з обраних ним"
+"(нею)\n"
 "\n"
 
 #: actions/twittersettings.php:27
@@ -3172,14 +3695,17 @@ msgstr ""
 "туди, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "�алаштуванн� Твіттера"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Рахунок на Твіттері"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Поточний підтверджений рахунок на Твіттері."
 
@@ -3188,6 +3714,7 @@ msgid "Twitter Username"
 msgstr "Ім'� на Твіттері"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Без пробілів, будь ла�ка."
 
@@ -3196,18 +3723,22 @@ msgid "Twitter Password"
 msgstr "Пароль на Твіттері"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "�втоматично пере�илати мої повідомленн� на Твіттер."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "�ад�илати локальні \"@\" відповіді на Твіттер."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "Підпи�ати�ь до моїх друзів на Твіттері тут."
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
@@ -3216,6 +3747,7 @@ msgstr ""
 "регі�трів та �имволів підкре�люванн� (_). 15 знаків це мак�имум."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "�е можна підтвердити ваші реквізити на Твіттері!"
 
@@ -3226,33 +3758,43 @@ msgstr "�е маю можливо�ті відновити інформацію
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "�е маю можливо�ті зберегти ваші налаштуванн� Твіттера!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "�алаштуванн� Твіттера збережено."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Це не є вашим рахунком на Твіттері."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "�е можна видалити кори�тувача Твіттер."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Твіттер рахунок видалено."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "�е можна зберегти преференції Твіттера."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Преференції Твіттера збережено."
 
@@ -3269,18 +3811,19 @@ msgid "The subscription has been rejected, but no "
 msgstr "Підпи�ку було �кинуто, але не "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "Результати команди"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "Команду виконано"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "Команду не виконано"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "Даруйте, але виконанн� команди ще не завершено."
 
@@ -3290,89 +3833,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "Підпи�ки: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "Кори�тувач має о�таннє повідомленн�"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "Повідомленн� позначено �к обране."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "Повне ім'�: %s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "Локаці�: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "Веб-�торінка: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "Про мене: %s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "Повідомленн� надто довге - мак�имум 140 знаків, а ви надрукували %d"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Пр�ме повідомленн� до %s наді�лано"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Помилка при відправці пр�мого повідомленн�."
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "Зазначте ім'� кори�тувача, до �кого бажаєте підпи�ати�ь"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Підпи�ано до %s"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Зазначте ім'� кори�тувача, від �кого бажаєте відпи�ати�ь"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Відпи�ано від %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "Виконанн� команди ще не завершено."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "Сповіщенн� вимкнуто."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "�е можна вимкнути �повіщенн�."
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "Сповіщенн� увімкнуто."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "�е можна увімкнути �повіщенн�."
 
@@ -3380,11 +3945,11 @@ msgstr "�е можна увімкнути �повіщенн�."
 msgid "Commands:\n"
 msgstr "Команди:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "�е можна долучити повідомленн�."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "�е можна оновити повідомленн� з новим URI."
 
@@ -3401,7 +3966,7 @@ msgstr ""
 "Тепер ви маєте нову адре�у дл� над�иланн� повідомлень на %1$s.\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "�ове приватне повідомленн� від %s"
@@ -3415,7 +3980,7 @@ msgstr ""
 "%1$s (%2$s) наді�лав(ла) вам приватне повідомленн�:\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 "Лише кори�тувач має можливі�ть перегл�дати �вою вла�ну поштову �криньку."
@@ -3425,31 +3990,39 @@ msgid "This form should automatically submit itself. "
 msgstr "Ц� форма має автоматично репрезентувати �ебе �и�темі. "
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Обрані"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Обрані допи�и %s"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Кори�тувач"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Вхідні"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Ваші вхідні повідомленн�"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Вихідні"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "�аді�лані вами повідомленн�"
 
@@ -3462,14 +4035,19 @@ msgid "Twitter integration options"
 msgstr "Опції інтеграції з Твіттером"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "До"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "�е можна розібрати повідомленн�."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
 msgstr "%s з друз�ми, �торінка %d"
@@ -3479,21 +4057,31 @@ msgid "You can upload your personal avatar."
 msgstr "Ви можете завантажити вашу пер�ональну аватару."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "�алаштуванн� аватари"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Оригінал"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Перегл�д"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Вт�ти"
 
@@ -3510,34 +4098,43 @@ msgid "There was a problem with your session token. "
 msgstr "Виникли певні проблеми з токеном поточної �е�ії. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Оберіть квадратну діл�нку зображенн�, �ка й буде вашою автарою."
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Дані вашого файлу де�ь загубили�ь."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 msgid "Lost our file."
 msgstr "Файл втрачено."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "Тип файлу не підтримуєть��"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr "�е визначено жодного профілю."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr "�е визначено профілю з таким ID."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr "Блокувати кори�тувача."
 
@@ -3545,11 +4142,11 @@ msgstr "Блокувати кори�тувача."
 msgid "Are you sure you want to block this user? "
 msgstr "Ви впевненні, що бажаєте заблокувати цього кори�тувача? "
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "Цього кори�тувача вже заблоковано."
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "Збереженн� інформації про блокуванн� завершило�ь невдачею."
 
@@ -3566,40 +4163,58 @@ msgstr "Ви видал�єте повідомленн� назавжди. "
 msgid "Add to favorites"
 msgstr "Додати до обраних"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Редагувати групу %s"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 "Поштові �криньки дл� вхідних повідомлень мають бути дозволені дл� роботи у "
 "групах"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Ви маєте �початку увійти, аби мати змогу �творити групу."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 msgid "No nickname"
 msgstr "�емає імені"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "Такої групи немає"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "Ви маєте бути наділені правами адміни�тратора, аби редагувати групу"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "Скори�тайте�ь цією формою, щоб відредагувати групу."
 
@@ -3608,14 +4223,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr "Ім'� кори�тувача повинно �кладати�ь з літер нижнього регі�тру "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "опи� надто довгий (140 знаків мак�имум)"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "�е вдало�� оновити групу."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "Опції збережено."
 
@@ -3632,7 +4248,8 @@ msgstr "Створити нову електронну адреÑ�у длÑ� наÐ
 msgid "Send me email when someone "
 msgstr "�ад�илати мені ли�та коли хто�ь "
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Дозволити друз�м \"розштовхати\" мене, наді�лавши мені ли�та."
 
@@ -3645,7 +4262,7 @@ msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
 "Код підтвердженн� був відправлений на електронну адре�у, �ку ви додали. "
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "Помилка �ервера - неможливо ді�тати�ь кори�тувача!"
 
@@ -3659,51 +4276,66 @@ msgstr "Якщо ви бажаєте додаток до %s длÑ� автомаÑ
 msgid "Allow %s to update my Facebook status"
 msgstr "Дозволити %s оновлювати мій �тату� у Facebook"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "Пропу�тити"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr "Повідомленн� не має змі�ту!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "�умераці� �торінок"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr "Вперед"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 msgid "Before"
 msgstr "�азад"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "Д�куємо, що запро�или �воїх друзів до %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr "Запрошенн� були наді�лані на�тупним кори�тувачам:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr "Ва� запрошують до %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr "Запро�іть �воїх друзів до %s"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "Друзі, �кі вже кори�тують�� %s:"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "�аді�лати запрошенн�"
@@ -3745,12 +4377,14 @@ msgstr "Якщо бажаєте %s длÑ� автоматичного оновлÐ
 msgid "Sync preferences"
 msgstr "Преференції �инхронізації"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr "Видалити з обраних"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 msgid "Popular notices"
 msgstr "Попул�рні допи�и"
 
@@ -3764,7 +4398,8 @@ msgid "The most popular notices on the site right now."
 msgstr "Пред�тавлено найбільш попул�рні допи�и на �айті."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "Кори�тувачі варті уваги"
 
@@ -3778,15 +4413,17 @@ msgstr "Кори�тувачі варті уваги, �торінка %d"
 msgid "A selection of some of the great users on %s"
 msgstr "Вибірка з де�ких видатних кори�тувачів на %s"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "Цей кори�тувач заблокував вашу можливі�ть підпи�ати�ь."
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "�емає ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "Логотип групи"
 
@@ -3794,11 +4431,13 @@ msgstr "Логотип групи"
 msgid "You can upload a logo image for your group."
 msgstr "Ви маєте можливі�ть завантажити логотип дл� вашої группи."
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "Логотип оновлено."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 msgid "Failed updating logo."
 msgstr "Оновленн� логотипу завершило�ь невдачею."
 
@@ -3817,7 +4456,8 @@ msgid "A list of the users in this group."
 msgstr "Спи�ок уча�ників цієї групи."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Групи"
 
@@ -3834,6 +4474,7 @@ msgstr ""
 "�пілкувати�ь з "
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr "Створити нову групу"
 
@@ -3843,7 +4484,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr "Пошук груп на %%site.name%% за їх назвою, локацією або опи�ом. "
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Пошук груп"
 
@@ -3865,20 +4506,20 @@ msgstr "�ад�илати мені відповіді за допомою Jabbe
 msgid "A confirmation code was sent "
 msgstr "Код підтвердженн� було відправлено "
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr "Ви повинні �початку увійти на �айт, аби приєднати�� до групи."
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "Ви вже є уча�ником цієї групи"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Кори�тувачеві %s не вдало�ь приєднати�ь до групи %s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr "%s приєднав�� до групи %s"
@@ -3887,15 +4528,18 @@ msgstr "%s приєднав�� до групи %s"
 msgid "Inboxes must be enabled for groups to work."
 msgstr "Скриньки вхідних повідомлень мають бути дозволені дл� роботи у групах."
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Ви повинні �початку увійти на �айт, аби залишити групу."
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "Такої групи немає."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr "Ви не є уча�ником цієї групи."
 
@@ -3903,21 +4547,25 @@ msgstr "Ви не є уча�ником цієї групи."
 msgid "You may not leave a group while you are its administrator."
 msgstr "Ви не можете залишити групу допоки ви є її адміні�тратором."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr "�е вдало�� знайти запи� щодо член�тва."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "�е вдало�� видалити кори�тувача %s з групи %s"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s залишив групу %s"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "Вхід на �айт"
 
@@ -3929,15 +4577,17 @@ msgstr "�і�кого поточного �тату�у"
 msgid "New group"
 msgstr "�ова група"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "Скори�тайте�ь цією формою дл� �творенн� нової групи."
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "�е вдало�� �творити нову групу"
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
 msgstr "�е вдало�� в�тановити член�тво."
 
@@ -3949,11 +4599,14 @@ msgstr "Це надто довго. "
 msgid "Don't send a message to yourself; "
 msgstr "�е над�илайте повідомлень �амому �обі; "
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "Повідомленн� відправлено"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Помилка в Ajax"
 
@@ -3972,7 +4625,7 @@ msgstr "Спробу \"розштовхати\" зараховано"
 msgid "Nudge sent!"
 msgstr "Спробу \"розштовхати\" зараховано!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr "Вхід OpenID"
 
@@ -3996,11 +4649,13 @@ msgstr "�втоматичне �короченн� URL-адре�"
 msgid "Service"
 msgstr "Серві�"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "Серві�и до�тупні дл� викори�танн�"
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Серві� �короченн� URL-адре� надто довгий (50 знаків мак�имум)."
 
@@ -4008,16 +4663,17 @@ msgstr "Серві� �короченн� URL-адре� надто довгий
 msgid "Change your password."
 msgstr "Змінити пароль."
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr "Пароль замінено"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Це недій�ний о�оби�тий тег: %s"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "Кори�тувачі з о�оби�тим тегом %s - �торінка %d"
@@ -4027,11 +4683,12 @@ msgstr "КориÑ�тувачі з оÑ�обиÑ�тим тегом %s - Ñ�торіÐ
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Тут пред�тавлені кори�тувачі, �кі позначили �ебе тегом \"%s\" "
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Інформаці� профілю"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4043,20 +4700,25 @@ msgid "Automatically subscribe to whoever "
 msgstr "�втоматична підпи�ка до будь кого, хто "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "�едій�ний тег: \"%s\""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 msgid "Couldn't save tags."
 msgstr "�е вдало�� зберегти теги."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Загальний потік, �торінка %d"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "�е вдаєть�� відновити загальний потік."
 
@@ -4066,8 +4728,8 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"Цей �айт %%site.name%%, є �ерві�ом [мікроблогів] "
-"(http://en.wikipedia.org/wiki/Micro-blogging) "
+"Цей �айт %%site.name%%, є �ерві�ом [мікроблогів] (http://en.wikipedia.org/"
+"wiki/Micro-blogging) "
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4078,11 +4740,13 @@ msgstr "Загальна хмарка тегів"
 msgid "These are most popular recent tags on %s "
 msgstr "Це найбільш попул�рні нові теги на %s "
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "Хмарка тегів"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 "Пробачте, але лише ті, кого було запрошено, мають змогу зареє�трувати�ь тут."
@@ -4132,7 +4796,8 @@ msgstr "(Ви маєте отримати ли�та електронною по
 msgid "That's a local profile! Login to subscribe."
 msgstr "Це локальний профіль! Увійдіть аби підпи�ати�ь."
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr "Відповіді %s, �торінка %d"
@@ -4142,50 +4807,71 @@ msgstr "Відповіді %s, �торінка %d"
 msgid "%s favorite notices, page %d"
 msgstr "Обрані повідомленн� %s, �торінка %d"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "Група %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Група %s, �торінка %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Профіль групи"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr "Зауваженн�"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Ді�льні�ть групи"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr "Живленн� повідомлень дл� групи %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Уча�ники"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(Пу�то)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "В�і уча�ники"
 
@@ -4202,7 +4888,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr "Лише відправник та отримувач "
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, �торінка %d"
@@ -4212,30 +4898,37 @@ msgid "'s profile"
 msgstr " профіль"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 msgid "User profile"
 msgstr "Профіль кори�тувача."
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "Фото"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr "Ді�льні�ть кори�тувача"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr "�аді�лати пр�ме повідомленн� цьому кори�тувачеві"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr "Повідомленн�"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr "В�і підпи�чики"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "В�і групи"
 
@@ -4260,7 +4953,7 @@ msgstr "Повідомл�ти мене за допомогою СМС; "
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Код підтвердженн� було наді�лано на телефонний номер, �кий ви додали. "
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Мобільний оператор"
 
@@ -4318,16 +5011,17 @@ msgstr "Тут пред�тавлені ті, за чиїми повідомле
 msgid "These are the people whose "
 msgstr "Тут пред�тавлені ті, чиї "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Повідомленн� позначені %s, �торінка %d"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "�айновіші повідомленн� позначені \"%s\""
@@ -4349,7 +5043,7 @@ msgstr "Позначити %s"
 msgid "Tag user"
 msgstr "Позначити кори�тувача"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4361,18 +5055,18 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "Виникли певні проблеми з токеном поточної �е�ії."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Ви маєте можливі�ть позначати тегами тих, до кого ви підпи�ані, а також тих, "
 "хто є підпи�аним до ва�."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "�е вдало�� зберегти теги."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Скори�тайте�ь цією формою, щоб додати теги підпи�кам та підпи�чикам."
 
@@ -4380,20 +5074,23 @@ msgstr "Скори�тайте�ь цією формою, щоб додати т
 msgid "No such tag."
 msgstr "Такого тегу немає."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, php-format
 msgid "Microblog tagged with %s"
 msgstr "Мікроблог позначено тегом %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "Спроба заблокувати кори�тувача невдала."
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "Спроба розблокувати кори�тувача невдала."
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "�е знайдено."
 
@@ -4401,15 +5098,16 @@ msgstr "�е знайдено."
 msgid "Add your Twitter account to automatically send "
 msgstr "Додайте �вій рахунок на Твіттері, аби автоматично пере�илати "
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr "Ваше ім'� кори�тувача на Твіттері"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 msgid "Twitter password"
 msgstr "Пароль на Твіттері"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr "Друзі на Твіттері"
 
@@ -4422,145 +5120,154 @@ msgstr "Ім'Ñ� кориÑ�тувача має Ñ�кладатиÑ�ÑŒ лише з Ñ
 msgid "Unable to retrieve account information "
 msgstr "�е вдаєть�� відновити інформацію рахунку "
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr "Помилка при розблокуванні."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "У запиті від�утній ID профілю."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "�емає профілю з таким ID."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Відпи�ано"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "Групи %s"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Групи %s, �торінка %d"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблема при збереженні повідомленн�. �евідомий кори�тувач."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Дуже багато повідомлень за короткий термін; відпочиньте трошки і "
 "повертайте�ь за кілька хвилин."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Вам заборонено над�илати допи�и до цього �айту."
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Завантаженн� аватари"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "Інше"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "Інші опції"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "Сторінка без заголовку"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Відправна навігаці� по �айту"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Пер�ональний профіль і потік друзів"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "Пошук людей або тек�тів"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "Рахунок"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Змінити електронну адре�у, аватару, пароль, профіль"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "Зв'�зок з ІМ, СМС, Твіттер"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "Вийти з �айту"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "Увійти на �айт"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 msgid "Create an account"
 msgstr "Створити новий рахунок"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 msgid "Login with OpenID"
 msgstr "Увійти з OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 msgid "Help me!"
 msgstr "Допоможіть!"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 msgid "Site notice"
 msgstr "Зауваженн� �айту"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "Огл�д"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 msgid "Page notice"
 msgstr "Зауваженн� �торінки"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Другор�дна навігаці� по �айту"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Ліцензі� StatusNet software"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "В�і "
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "ліцензі�."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block this user"
 msgstr "Блокувати кори�тувача"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "Блок"
 
@@ -4573,11 +5280,14 @@ msgstr "Видалити з обраних"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "�би �кори�тати�ь %s додатком дл� Facebook, ви маєте увійти "
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr " новий рахунок."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "Опубліковано"
 
@@ -4597,31 +5307,36 @@ msgstr "Фільтр дл� тегів"
 msgid "All"
 msgstr "В�і"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Тег"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Оберіть тег до звуженого �пи�ку"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Вперед"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL-адре�а веб-�торінки, блогу групи, або тематичного блогу"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Опи�"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr "Опишіть групу або тему, вкладаючи�ь у 140 знаків"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Локаці� групи, на зразок \"Мі�то, обла�ть (або регіон), країна\""
@@ -4630,20 +5345,20 @@ msgstr "ЛокаціÑ� групи, на зразок \"МіÑ�то, облаÑ�Ñ‚Ñ
 msgid "Group"
 msgstr "Група"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "�дмін"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Редагувати вла�тиво�ті групи %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr "Лого"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Додати або редагувати логотип %s"
@@ -4673,11 +5388,11 @@ msgstr "Приєднати�ь"
 msgid "Leave"
 msgstr "Залишити"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Увійти викори�товуючи ім'� та пароль"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Зареє�трувати новий рахунок"
 
@@ -4699,17 +5414,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s тепер �лідкує за повідомлен�ми "
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Локаці�: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Веб-�торінка: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4718,7 +5433,7 @@ msgstr ""
 "Про �ебе: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Ва� �пробував \"розштовхати\" %s"
@@ -4733,39 +5448,47 @@ msgstr "%1$s (%2$s) цікавить��, що у ва� нового "
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s додав ваше повідомленн� від %2$s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr "Від"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "�аді�лати пр�ме повідомленн�"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 msgid "Send a notice"
 msgstr "�аді�лати повідомленн�"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Лишило�ь знаків"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr "у відповідь на"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Відпові�ти на це повідомленн�"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Відпові�ти"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr "Видалити повідомленн�"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr "Видалити"
 
@@ -4786,29 +5509,29 @@ msgstr "Спробувати \"розштовхати\" цього кориÑ�Ñ‚Ñ
 msgid "Tags in %s's notices"
 msgstr "Теги у повідомленн�х %s"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(пу�то)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Загал"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Групи кори�тувачів"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "�ові теги"
 
-# ПОСТ�ТЬ - Видатна о�оба, визначний пред�тавник кого-, чого-небудь.
-# "Featured" перекла�ти одним �ловом, так щоб вти�ло�� в таб на головній �торінці, важко. �а мою думку "По�таті", тобто кори�тувачі, �кі варті уваги - цілком прийн�тний замінник.
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "По�таті"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Попул�рне"
 
@@ -4824,31 +5547,33 @@ msgstr "Знайти групи на цьому �айті"
 msgid "Untitled section"
 msgstr "Розділ без заголовку"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s підпи�ав�� до на�тупних людей"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Люди підпи�ані до %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s бере уча�ть в цих групах"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Запро�іть друзів та колег приєднати�ь до ва� на %s"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Кори�тувач заблокував ва�."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr "Підпи�ати�ь до цього кори�тувача"
 
@@ -4861,10 +5586,11 @@ msgid "Top posters"
 msgstr "Топ допи�увачів"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "Розблокувати цього кори�тувача"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "Розблокувати"
 
@@ -4872,39 +5598,2065 @@ msgstr "Розблокувати"
 msgid "Unsubscribe from this user"
 msgstr "Відпи�ати�ь від цього кори�тувача"
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Живленн� дл� друзів %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Живленн� дл� друзів %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Живленн� дл� друзів %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s з друз�ми"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Ви можете завантажити вашу пер�ональну аватару."
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "�ватару оновлено."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 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:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+"Виникли певні проблеми з токеном поточної �е�ії. Спробуйте знов, будь ла�ка."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "�ад�илати мені ли�та, коли хто�ь шле приватне повідомленн� дл� мене."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Ви маєте можливі�ть завантажити логотип дл� вашої группи."
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Оберіть квадратну діл�нку зображенн�, �ка й буде вашою автарою."
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Мікроблог від %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Пошук людей на %%site.name%% за їх ім'�м, локацією або інтере�ами. "
+"Відокремлюйте пошукові умови інтервалами; вони повинні �кладати�ь з 3 знаків "
+"або більше."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Помилка при відправці пр�мого повідомленн�."
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Потік пошуку дл� \"%s\""
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"З міркувань безпеки, будь ла�ка, введіть ще раз ім'� та пароль, перед тим �к "
+"змінювати налаштуванн�."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Живленн� загального потоку"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Живленн� загального потоку"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Живленн� загального потоку"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" окрім цих приватних даних: пароль, електронна адре�а, адре�а IM, телефонний "
+"номер."
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Створити"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Профіль групи"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr " профіль"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Живленн� повідомлень дл� %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Живленн� повідомлень дл� %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Живленн� повідомлень дл� %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Вихідні дл� %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "�ватара"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "�алаштуванн� профілю"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Код підтвердженн� був відправлений на телефонний номер, �кий ви додали. "
+"Перевірте вхідні повідомленн�, там має бути код та подальші ін�трукції."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "�емає такого кори�тувача"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Додайте ваш рахунок на Твіттері дл� автоматичного пере�иланн� повідомлень "
+"туди, "
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "�е маю можливо�ті відновити інформацію дл� \"%s\" з Твіттера."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Пошук людей або тек�тів"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Дуже багато повідомлень за короткий термін; відпочиньте трошки і "
+"повертайте�ь за кілька хвилин."
+
+#: lib/action.php:406 lib/action.php:425
+#, fuzzy
+msgid "Connect to SMS, Twitter"
+msgstr "Зв'�зок з ІМ, СМС, Твіттер"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "\"Розштовхати\""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "�би �кори�тати�ь %s додатком дл� Facebook, ви маєте увійти "
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s тепер �лідкує за вашими повідомлен�ми на %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Щиро ваші,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Пошук"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Створити новий рахунок"
+msgid "No such attachment."
+msgstr "Такого документа немає."
 
+#: actions/block.php:149
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Ви впевненні, що бажаєте видалити це повідомленн�?"
+msgid "Do not block this user from this group"
+msgstr "Спи�ок уча�ників цієї групи."
 
+#: actions/block.php:150
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Знайти змі�т повідомленн�"
+msgid "Block this user from this group"
+msgstr "Спи�ок уча�ників цієї групи."
 
-#~ msgid " by "
-#~ msgstr "від"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Профіль кори�тувача."
 
-#~ msgid "%1$s Notices recently tagged with %2$s"
-#~ msgstr "%1$s Повідомленн� щойно позначені з %2$s"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s з друз�ми, �торінка %d"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Помилка при додаванні повідомленн�"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Спи�ок уча�ників цієї групи."
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr ""
-#~ "Якщо ви забули, або загубили �вій пароль, ви можете отримати новий на "
-#~ "електронну адре�у, �ку ви закріпили за �воїм рахунком."
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Спроба розблокувати кори�тувача невдала."
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Код підтвердженн�"
 
-#~ msgid "Last message posted: "
-#~ msgstr "О�таннє повідомленн�:"
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "�е можна видалити це повідомленн�."
 
-#~ msgid "Unsupported type"
-#~ msgstr "Тип не підтримуєть��"
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "�едій�ний тег: \"%s\""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Це ім'� вже викори�товуєть��. Спробуйте інше."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "�е можна позначити �к обране."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "�ове повідомленн�"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "�ове повідомленн�"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Це недій�не ім'� кори�тувача."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "�е визначено жодного профілю."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Кори�тувач заблокував ва�."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Ви не є уча�ником цієї групи."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Блокувати кори�тувача."
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Ви маєте �початку увійти, аби мати змогу �творити групу."
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Групи"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "�е вдало�� оновити кори�тувача."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "�е маю можливо�ті зберегти ваші налаштуванн� Твіттера!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Преференції �инхронізації збережно."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Ви маєте бути наділені правами адміни�тратора, аби редагувати групу"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "�дмін"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "�емає результатів"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Кори�тувач заблокував ва�."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Повідомленн�"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "�е вдало�� зберегти профіль."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) дає вам можливі�ть реє�трувати�� на багатьох "
+"�айтах  кори�туючи�ь єдиним рахунком.  Керувати вашими OpenID можна звід�и."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "�алаштуванн� профілю"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"Цей �айт %%site.name%%, є �ерві�ом [мікроблогів] (http://en.wikipedia.org/"
+"wiki/Micro-blogging) "
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've 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
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Ва� ідентифіковано. Введіть  новий пароль нижче. "
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Запит на відновленн� паролю відправлено."
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Помилка з кодом підтвердженн�."
 
-#~ msgid "not a supported data format"
-#~ msgstr "формат даних не підтримуєть��"
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Підпи�ати�ь до цього кори�тувача"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Обрані повідомленн� %s, �торінка %d"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Живленн� повідомлень дл� групи %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Живленн� повідомлень дл� групи %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Живленн� повідомлень дл� групи %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"**%s** це група кори�тувачів на �айті %%%%site.name%%%%, �кий є �ерві�ом "
+"[мікроблогів] (http://en.wikipedia.org/wiki/Micro-blogging) "
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "�дмін"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Такого кори�тувача немає."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Повідомленн� позначені з %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Живленн� повідомлень дл� групи %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"**%s** є вла�ником рахунку на �айті %%%%site.name%%%% - �ерві�і "
+"[мікроблогів] (http://en.wikipedia.org/wiki/Micro-blogging) "
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s тепер �лідкує за повідомлен�ми "
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Живленн� повідомлень дл� %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Живленн� повідомлень дл� %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Це повідомленн� вже є обраним!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Це повідомленн� не є обраним!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "�е вдаєть�� відновити загальний потік."
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "Жодного отримувача не визначено."
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Жодних �тату�ів не ви�влено."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Оновленні відповіді %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Оновленн� від %1$s на %2$s!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "ліцензі�."
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Підпи�ки %s"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "�алаштуванн� профілю"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Ви не є уча�ником цієї групи."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Проблема при збереженні повідомленн�."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Повідомленн� до %1$s на %2$s"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Профіль кори�тувача."
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Профіль"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Завантажити"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Змінити ваш пароль"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "З'єднанн�"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Пошук"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Увійти"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Блок"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Блокувати кори�тувача."
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Додати або редагувати логотип %s"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "�емає змі�ту!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Кори�тувач"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Пошук"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Веб-�торінка має недій�ну URL-адре�у."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Такого тегу немає."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Пр�ме повідомленн� до %s"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "�адто довго. Мак�имальний розмір 140 знаків."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "�е вдало�� додати кори�тувача: кори�тувача не знайдено."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "опи� надто довгий (140 знаків мак�имум)"
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Ви вже є уча�ником цієї групи"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Кори�тувачеві %s не вдало�ь приєднати�ь до групи %s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Ви не є уча�ником цієї групи."
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "�е вдало�� видалити кори�тувача %s з групи %s"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Групи %s"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s бере уча�ть в цих групах"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Ді�льні�ть групи"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "�ватару оновлено."
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "�адто довго. Мак�имальний розмір повідомленн� 140 знаків."
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Формат зображенн� не підтримуєть��."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Фото"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "опи� надто довгий (140 знаків мак�имум)"
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Оновленн� від %1$s на %2$s!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Кори�тувача, �кий �лідкував за вашими повідомленн�ми, більше не і�нує."
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "�е авторизовано."
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "�е вдало�� перетворити токени запиту на токени зверненн�."
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "�евідома вер�і� протоколу OMB."
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Такого повідомленн� немає."
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Файл втрачено."
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Оновленн� від %1$s на %2$s!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Ц� �торінка не до�тупна в "
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Увійти викри�товуючи ім'� та пароль. Ще не маєте імені кори�тувача? "
+"[Зареє�трувати](%%action.register%%) новий акаунт, або �пробувати [OpenID](%%"
+"action.openidlogin%%). "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Оновленн� від %1$s на %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "В�і оновленн� за збігом з \"%s\""
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "З'єднанн�"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Опишіть �ебе та �вої інтере�и (140 знаків)"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Опишіть �ебе та �вої "
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Ви перевищили ліміт (140 знаків це мак�имум)"
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Це недій�на URL-адре�а профілю (немає документа YADIS)."
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Це локальний профіль! Увійдіть аби підпи�ати�ь."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "�е вдало�� отримати токен запиту."
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Живленн� повідомлень дл� %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Живленн� повідомлень дл� %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Живленн� повідомлень дл� %s"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Повідомленн� до %1$s на %2$s"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Живленн� дл� друзів %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Живленн� дл� друзів %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Живленн� дл� друзів %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Вихідні дл� %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Повідомленн� відправлено"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Ц� �торінка не до�тупна в "
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Живленн� повідомлень дл� %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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:249
+#, 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:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Підпи�ку було �кинуто, але URL-адре�а у відповідь не передавала��. Звірте�ь "
+"з ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к �кинути "
+"підпи�ку."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "�е можна прочитати URL аватари '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "�еправильний тип зображенн� дл� '%s'"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "�евдале перенаправленн� на �ервер: %s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Ліцензі� StatusNet software"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "�е вдало�� оновити кори�тувача з підтвердженною електронною адре�ою."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Спробу \"розштовхати\" зараховано"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Повідомленн� надто довге - мак�имум 140 знаків, а ви надрукували %d"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Повідомленн� надто довге - мак�имум 140 знаків, а ви надрукували %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Відпові�ти на це повідомленн�"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Проблема при збереженні повідомленн�."
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "�емає коду підтвердженн�."
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Увійти на �айт"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Оберіть оператора"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Опишіть групу або тему, вкладаючи�ь у 140 знаків"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Опишіть групу або тему, вкладаючи�ь у 140 знаків"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "�ове повідомленн�"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s додав(ла) ваше повідомленн� до обраних"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " від "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "�е вдаєть�� відновити загальний потік."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Видалити повідомленн�"
diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo
index b2f4dd370..afc0fe785 100644
--- a/locale/vi/LC_MESSAGES/statusnet.mo
+++ b/locale/vi/LC_MESSAGES/statusnet.mo
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index af34d5210..69fb732e4 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -1,28 +1,29 @@
+# Translation of StatusNet to Vietnamese
+#
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: statusnet\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-05-10 05:27+0000\n"
-"Last-Translator: NGUYỄN Mạnh Hùng <loveleeyoungae@yahoo.com>\n"
-"Language-Team: <support@saigonica.com>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:47+0000\n"
+"Language-Team: Vietnamese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Language: English\n"
-"X-Poedit-Country: NEW ZEALAND\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: vi\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Tìm dòng thông tin cho \"%s\""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại"
@@ -33,17 +34,19 @@ msgid " from "
 msgstr " từ "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Các cập nhật đang trả l�i tới %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s moi ban tham gia vao %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -101,6 +104,7 @@ msgstr ""
 "Thân, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s."
@@ -123,25 +127,28 @@ msgstr ""
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Trạng thái của %1$s vào %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Dòng tin công cộng"
@@ -151,34 +158,48 @@ msgstr "%s Dòng tin công cộng"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s và bạn bè"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, fuzzy, php-format
 msgid "%s public timeline"
 msgstr "Dòng tin công cộng"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, fuzzy, php-format
 msgid "%s status"
 msgstr "Trạng thái của %1$s vào %2$s"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, fuzzy, php-format
 msgid "%s timeline"
 msgstr "Dòng tin nhắn của %s"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s cập nhật từ tất cả m�i ngư�i!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -186,7 +207,8 @@ msgstr ""
 "(Bạn sẽ nhận email thông báo, hãy đ�c hướng dẫn để xác nhận địa chỉ email "
 "của bạn.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -195,7 +217,8 @@ msgstr ""
 "**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%"
 "%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
@@ -207,32 +230,36 @@ msgstr "Ngư�i đăng ký nên được phân theo tên hoặc nickname"
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 chữ cái thư�ng hoặc là chữ số, không có dấu chấm hay "
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 chữ cái thư�ng hoặc là chữ số, không có dấu chấm hay khoảng trắng. Bắt "
 "buá»™c."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "Nhi�u hơn 6 ký tự"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "Nhi�u hơn 6 ký tự, đừng quên nó!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "Nhi�u hơn 6 ký tự. Bắt buộc"
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -242,6 +269,7 @@ msgstr ""
 "tin nhắn đến bạn."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -276,7 +304,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Phương thức API không tìm thấy!"
 
@@ -299,16 +354,23 @@ msgstr "Phương thức API không tìm thấy!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "Phương thức API dưới cấu trúc có sẵn."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "Giới thiệu"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "Chấp nhận"
 
@@ -319,6 +381,9 @@ msgstr "Chấp nhận"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "Thêm"
 
@@ -336,28 +401,30 @@ msgstr "Thêm mới hoặc xóa OpenIDs"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "�ịa chỉ"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 "Các địa chỉ email của những ngư�i bạn muốn m�i (mỗi địa chỉ nằm trên 1 dòng)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Tất cả đăng nhận"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "Tất cả các cập nhật của %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "Các thay đổi phù hợp với từ \"%s\""
@@ -367,30 +434,37 @@ msgstr "Các thay đổi phù hợp với từ \"%s\""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "�ã đăng nhập."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "�ã đăng nhận rồi!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "�ăng nhận cho phép"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Tự động theo những ngư�i nào đăng ký theo tôi"
@@ -398,15 +472,19 @@ msgstr "Tự động theo những ngư�i nào đăng ký theo tôi"
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "Hình đại diện"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "Hình đại diện đã được cập nhật."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -416,6 +494,7 @@ msgstr ""
 "nhận tin nhắn và l�i hướng dẫn. (Bạn đã thêm %s vào danh sách bạn thân chưa?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -424,7 +503,7 @@ msgstr ""
 "để nhận tin nhắn và l�i hướng dẫn."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 #, fuzzy
 msgid "Awaiting confirmation on this phone number."
 msgstr "�ó không phải là số điện thoại của bạn."
@@ -437,6 +516,8 @@ msgstr "TrÆ°á»›c"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "Lý lịch"
 
@@ -444,16 +525,18 @@ msgstr "Lý lịch"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "Lý lịch quá dài (không quá 140 ký tự)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "Không thể xóa tin nhắn này."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Không thể đ�c URL cho hình đại diện '%s'"
@@ -461,6 +544,8 @@ msgstr "Không thể đ�c URL cho hình đại diện '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "Không thể lưu mật khẩu mới"
 
@@ -468,32 +553,35 @@ msgstr "Không thể lưu mật khẩu mới"
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "Hủy"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Không thể thiết lập đối tượng OpenID."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "Không thể bình thư�ng hóa Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 #, fuzzy
 msgid "Cannot normalize that email address"
 msgstr "Không thể bình thư�ng hóa địa chỉ GTalk này"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "Thay đổi"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "�ang thực hiện việc thay đổi email"
 
@@ -503,11 +591,12 @@ msgid "Change password"
 msgstr "�ổi mật khẩu"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "Thay đổi mật khẩu của bạn"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
 
@@ -517,6 +606,9 @@ msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "Xác nhận"
 
@@ -529,12 +621,14 @@ msgstr "Xác nhận địa chỉ"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "Sự xác nhận đã bị hủy b�."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 #, fuzzy
 msgid "Confirmation code"
 msgstr "Không có mã số xác nhận."
@@ -544,7 +638,8 @@ msgstr "Không có mã số xác nhận."
 msgid "Confirmation code not found."
 msgstr "Không tìm thấy mã xác nhận."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -576,20 +671,24 @@ msgstr ""
 "Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "Kết nối"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "Kết nối đến tài khoản hiện hữu"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "Liên hệ"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Không thể tạo OpenID mẫu: %s"
@@ -597,37 +696,41 @@ msgstr "Không thể tạo OpenID mẫu: %s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 #, fuzzy
 msgid "Could not follow user: User not found."
 msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Không thể chuyển đến máy chủ: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "Không thể lưu hình đại diện"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "Không thể lưu thông tin v� hồ sơ cá nhân"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 #, fuzzy
 msgid "Could not subscribe other to you."
 msgstr "Không thể tạo favorite."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 #, fuzzy
 msgid "Could not subscribe."
 msgstr "Chưa đăng nhận!"
@@ -648,15 +751,17 @@ msgstr "Không thể chuyển các token yêu cầu đến token truy cập."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "Không thể xóa email xác nhận."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "Không thể xóa đăng nhận."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "Không tìm thấy bất kỳ trạng thái nào."
 
@@ -669,23 +774,27 @@ msgstr "Không thể lấy token yêu cầu."
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "Không thể  chèn mã xác nhận."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "Không thể chèn thêm vào đăng nhận."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "Không thể lưu hồ sơ cá nhân."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 #, fuzzy
 msgid "Couldn't update user for autosubscribe."
 msgstr "Không thể cập nhật thành viên."
@@ -693,6 +802,11 @@ msgstr "Không thể cập nhật thành viên."
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 #, fuzzy
 msgid "Couldn't update user record."
 msgstr "Không thể cập nhật thành viên."
@@ -709,42 +823,48 @@ msgstr "Không thể cập nhật thành viên."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "Không thể cập nhật thành viên."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "Tạo"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "Tạo ngư�i dùng mới với tên đăng nhập này."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "Tạo tài khoản mới"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Tạo tài khoản mới hoặc dùng OpenID"
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "�ịa chỉ Jabber/GTalk vừa được xác nhận."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "SMS xác nhận ngay - đã cho phép gửi qua điện thoại. "
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "�ã xác nhận địa chỉ này."
 
@@ -753,23 +873,27 @@ msgid "Currently"
 msgstr "Hiện tại"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, fuzzy, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "Lỗi cơ sở dữ liệu khi chèn trả l�i: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Lỗi cơ sở dữ liệu khi chèn trả l�i: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "Xóa tin nhắn"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Nói v� bạn và những sở thích của bạn khoảng 140 ký tự"
 
@@ -777,11 +901,13 @@ msgstr "Nói vá»� bạn và những sở thích của bạn khoảng 140 ký tá»
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "Email"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 #, fuzzy
 msgid "Email Address"
 msgstr "�ịa chỉ email"
@@ -792,40 +918,44 @@ msgid "Email Settings"
 msgstr "Thiết lập địa chỉ email"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "�ịa chỉ email đã tồn tại."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Xac nhan dia chi email"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 #, fuzzy
 msgid "Email address, like \"UserName@example.org\""
 msgstr "�ịa chỉ email GTalk, Ví dụ: \"UserName@gmail.com\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "�ịa chỉ email"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Nhập biệt hiệu hoặc email."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "Nhập mã mà bạn nhận được trên điện thoại của bạn."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "Lỗi cho phép token"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "Lỗi xảy ra khi kết nối với OpenId"
 
@@ -836,39 +966,46 @@ msgstr "Lỗi khi kết nối ngư�i dùng."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "Lỗi xảy ra khi thêm mới hình đại diện"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "Lỗi xảy ra khi lưu địa chỉ đã được xác nhận."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "Lỗi xảy ra khi lưu hồ sơ cá nhân"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "Lỗi xảy ra khi lưu hồ sơ cá nhân."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "Lỗi xảy ra khi lưu thành viên."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "Lỗi xảy ra khi lưu thành viên;  không hợp lệ."
 
@@ -877,6 +1014,9 @@ msgstr "Lỗi xảy ra khi lưu thành viên;  không hợp lệ."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "Lỗi xảy ra khi tạo thành viên."
 
@@ -887,6 +1027,7 @@ msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
 
@@ -896,33 +1037,36 @@ msgid "Error with confirmation code."
 msgstr "Lỗi xảy ra với mã xác nhận."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "Biệt hiệu này đã tồn tại"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "Cập nhật hình đại diện không thành công."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Ch�n những ngư�i bạn của %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Ch�n các phản hồi đến %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, fuzzy, php-format
 msgid "Feed for tag %s"
 msgstr "Ch�n các phản hồi đến %s"
@@ -937,7 +1081,7 @@ msgstr "Tìm theo nội dung của tin nhắn"
 msgid "Find people on this site"
 msgstr "Tìm kiếm m�i ngư�i trên trang web này"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -950,6 +1094,11 @@ msgstr ""
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "Tên đầy đủ"
 
@@ -958,23 +1107,33 @@ msgstr "Tên đầy đủ"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "Hướng dẫn"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "Trang chủ"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "Trang chủ hoặc Blog"
 
@@ -982,21 +1141,27 @@ msgstr "Trang chủ hoặc Blog"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "Trang chủ không phải là URL"
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "Tôi muốn đưa tin nhắn lên bằng email."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM"
 
@@ -1006,7 +1171,7 @@ msgid "IM Settings"
 msgstr "Cấu hình IM"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1014,7 +1179,7 @@ msgstr ""
 "Bạn đã có tài khoản rồi, hãy đăng nhập bằng tên đăng nhập và mật khẩu để kết "
 "nối với OpenId của bạn."
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
@@ -1022,7 +1187,7 @@ msgstr ""
 "Bạn muốn thêm một OpenId vào tài khoản của bạn, đánh nó vào hộp dưới đây và "
 "nhấn\" Thêm\"."
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -1033,26 +1198,32 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "�ịa chỉ email hoặc mật khẩu không đúng."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Mật khẩu cũ sai"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "Sai tên đăng nhập hoặc mật khẩu."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1061,30 +1232,31 @@ msgstr ""
 "trong tài khoản của bạn."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "URL cho hình đại diện '%s'  không hợp lệ "
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "�ịa chỉ email không đúng:%s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Trang chủ '%s'  không hợp lệ"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "URL cấp phép '%s'  không hợp lệ"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "Nội dung tin nhắn không hợp lệ"
 
@@ -1099,13 +1271,13 @@ msgid "Invalid notice url"
 msgstr "URL tin nhắn không hợp lệ"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "URL hồ sơ cá nhân của '%s' không hợp lệ"
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "URL hồ sơ cá nhân không đúng định dạng."
 
@@ -1123,28 +1295,35 @@ msgstr "Kích thước không hợp lệ."
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "Thư m�i đã gửi"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "Thư m�i đã gửi đến:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "Thư m�i"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "Gửi thư m�i đến những ngư�i chưa có tài khoản"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, fuzzy, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1152,15 +1331,16 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 "�ang dùng [StatusNet](http://status.net/), phiên bản %s phát hành theo bản "
-"quy�n [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"quy�n [GNU Affero General Public License](http://www.fsf.org/licensing/"
+"licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID này đã thuộc v� ngư�i khác rồi."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1170,12 +1350,14 @@ msgstr ""
 "tạo thêm %s vào danh sách buddy trên IM client hoặc GTalk của bạn."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "Ngôn ngữ"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 #, fuzzy
 msgid "Language is too long (max 50 chars)."
 msgstr "Ngôn ngữ qua� dài (tối đa là 50 ký tự)."
@@ -1185,7 +1367,15 @@ msgstr "Ngôn ngữ qua� dài (tối đa là 50 ký tự)."
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "Thành phố"
 
@@ -1194,7 +1384,12 @@ msgstr "Thành phố"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 
@@ -1203,18 +1398,22 @@ msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "�ăng nhập"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "�ăng nhập bằng tài khoản [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1225,22 +1424,26 @@ msgstr ""
 "khoản, [hãy đăng ký](%%action.register%%) tài khoản mới, hoặc thử đăng nhập "
 "bằng [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "Thoát"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "H� tên đầy đủ của bạn, tốt nhất là tên thật của bạn."
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "Mất hoặc quên mật khẩu?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Tạo một địa chỉ email mới để đưa tin nhắn lên; và xóa "
 
@@ -1251,16 +1454,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "Bạn nhận email từ %%site.name%% như thế nào."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "Gia nhập từ"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog bởi  %s"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1273,43 +1478,51 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "Ghi chú và các file của tôi đã có ở phía dưới"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "Mơ�i"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Dia chi email moi de gui tin nhan den %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "�ã xác nhận địa chỉ này."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "Biệt hiệu mới"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "Thông báo mới"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây gi�."
 
@@ -1319,7 +1532,13 @@ msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập nga
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "Biệt danh"
 
@@ -1328,7 +1547,12 @@ msgstr "Biệt danh"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
 
@@ -1337,48 +1561,59 @@ msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Biệt hiệu phải là chữ viết thư�ng hoặc số và không có khoảng trắng."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "Biệt hiệu không được cho phép."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Biệt hiệu của thành viên mà bạn muốn theo"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "Biệt hiệu hoặc email"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "Không"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Không có Jabber ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "Không có yêu cầu!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 #, fuzzy
 msgid "No carrier selected."
 msgstr "Bạn chưa ch�n hình để đưa lên."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "Không có mã nào được nhập"
 
@@ -1390,11 +1625,15 @@ msgstr "Không có mã số xác nhận."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "Không có nội dung!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Không có địa chỉ email."
 
@@ -1403,7 +1642,9 @@ msgid "No id."
 msgstr "Không có id."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 #, fuzzy
 msgid "No incoming email address."
 msgstr "�ịa chỉ email không hợp lệ."
@@ -1415,6 +1656,7 @@ msgstr "Không có biệt hiệu được cung cấp."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "Không có biệt hiệu."
 
@@ -1422,12 +1664,14 @@ msgstr "Không có biệt hiệu."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Sự xác nhận chưa được hủy b�."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "Không có số điện thoại."
 
@@ -1437,7 +1681,8 @@ msgid "No profile URL returned by server."
 msgstr "Không có URL cho hồ sơ để quay v�."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "Thành viên này đã không đăng ký địa chỉ email."
 
@@ -1449,7 +1694,7 @@ msgstr "Không tìm thấy yêu cầu nào!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "Không có kết quả nào"
 
@@ -1460,12 +1705,16 @@ msgstr "Không có kích thước."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
 
@@ -1475,13 +1724,15 @@ msgid "No such OpenID."
 msgstr "Không có OpenID nào."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "Không có tài liệu nào."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Không có tin nhắn nào."
 
@@ -1519,12 +1770,22 @@ msgstr "Không có đăng ký nào."
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "Không có user nào."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr ""
 "Không tìm thấy ngư�i dùng nào tương ứng với địa chỉ email hoặc username đó."
@@ -1539,33 +1800,39 @@ msgid "Not a recovery code."
 msgstr "Mã khôi phục không đúng."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "Không có ngư�i dùng nào đăng ký"
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "Không hỗ trợ định dạng dữ liệu này."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID không hợp lệ"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "OpenID không hợp lệ."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 #, fuzzy
 msgid "Not a valid email address"
 msgstr "�ịa chỉ email không hợp lệ."
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "�ịa chỉ email không hợp lệ."
 
@@ -1573,6 +1840,11 @@ msgstr "�ịa chỉ email không hợp lệ."
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "Biệt hiệu không hợp lệ."
 
@@ -1592,7 +1864,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "Không phải là URL v� hồ sơ cá nhân hợp lệ (không phải là "
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "File h�ng hoặc không phải là file ảnh."
 
@@ -1603,11 +1876,13 @@ msgstr "Chưa được phép."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Không mong đợi trả l�i lại!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "Không tìm thấy"
 
@@ -1623,11 +1898,15 @@ msgstr "Không tìm thấy"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "Chưa đăng nhập."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "Chưa đăng nhận!"
 
@@ -1644,39 +1923,44 @@ msgid "Notice feed for %s"
 msgstr "Dòng tin nhắn cho %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "Tin nhắn không có hồ sơ cá nhân"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "Tin nhắn"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Thông báo được gắn thẻ %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "Mật khẩu cũ"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "Tạo tài khoản OpenID"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "Tự động nhập OpenID"
 
@@ -1684,29 +1968,34 @@ msgstr "Tự động nhập OpenID"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "�ăng nhập OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "Xác thực OpenID bị hủy."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Xác thực OpendID bị lỗi: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID lá»—i: %s"
@@ -1722,11 +2011,12 @@ msgid "OpenID settings"
 msgstr "Cấu hình OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "Không bắt buộc phải thêm thông điệp vào thư m�i."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "Upload từng phần."
 
@@ -1736,34 +2026,46 @@ msgstr "Upload từng phần."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "Mật khẩu"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "Mật khẩu và mật khẩu xác nhận không khớp nhau."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "Mật khẩu phải nhi�u hơn 6 ký tự."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "Yêu cầu khôi phục lại mật khẩu đã được gửi"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "�ã lưu mật khẩu."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "Mật khẩu không khớp."
 
@@ -1784,14 +2086,17 @@ msgid "People search"
 msgstr "Tìm kiếm nhi�u ngư�i"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Cá nhân"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "Tin nhắn cá nhân"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Số điện thoại, không cho phép nhập dấu chấm và ký tự "
 
@@ -1806,7 +2111,7 @@ msgstr ""
 "của h�, hãy nhấn \"Hủy b�\""
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Gửi một tin nhắn khi trạng thái của tôi trên Jabber hay GTalk "
 
@@ -1815,7 +2120,9 @@ msgstr "Gửi một tin nhắn khi trạng thái của tôi trên Jabber hay GTa
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Tính năng"
 
@@ -1824,42 +2131,52 @@ msgstr "Tính năng"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Các tính năng đã được lưu."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "Ngôn ngữ bạn thích"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "Riêng tư"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "Hồ sơ "
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "URL của Hồ sơ cá nhân"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Các thiết lập cho Hồ sơ cá nhân"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Hồ sơ này không biết"
 
@@ -1868,17 +2185,19 @@ msgid "Public Stream Feed"
 msgstr "Dòng tin công cộng"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "Dòng tin công cộng"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Gửi MicroID đến địa chỉ Jabber/GTalk của tôi. "
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
 
@@ -1888,12 +2207,14 @@ msgid "Recent Tags"
 msgstr "Các từ khóa hiện tại"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "Khôi phục"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "Khôi phục mật khẩu"
 
@@ -1906,38 +2227,46 @@ msgstr "Khôi phục lại code cho user không đăng ký."
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "�ăng ký"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 #, fuzzy
 msgid "Registration not allowed."
 msgstr "Biệt hiệu không được cho phép."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "�ăng ký thành công"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "Từ chối"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "Nhớ tôi"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "�ăng nhận từ xa"
 
@@ -1951,6 +2280,9 @@ msgstr "�ăng nhận từ xa"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "Xóa"
 
@@ -1959,7 +2291,7 @@ msgstr "Xóa"
 msgid "Remove OpenID"
 msgstr "Xóa OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
@@ -1968,34 +2300,41 @@ msgstr ""
 "hãy tạo một OpenID khác trước đã."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "Trả l�i"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "Trả l�i cho %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Khởi tạo"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "Khởi tạo lại mật khẩu"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "Số điện thoại để nhắn SMS "
 
@@ -2004,17 +2343,18 @@ msgstr "Số điện thoại để nhắn SMS "
 msgid "SMS Settings"
 msgstr "Thiết lập SMS"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "Xác nhận SMS"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Cùng mật khẩu ở trên"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "Cùng mật khẩu ở trên. Bắt buộc."
 
@@ -2027,12 +2367,21 @@ msgstr "Cùng mật khẩu ở trên. Bắt buộc."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "LÆ°u"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "Tìm kiếm"
 
@@ -2042,7 +2391,7 @@ msgid "Search Stream Feed"
 msgstr "Tìm kiếm dòng thông tin"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -2051,7 +2400,7 @@ msgstr ""
 "Tìm kiếm những tin nhắn trên %%site.name%% bằng nội dung. Chia các cụm từ "
 "cần tìm bởi khoảng trắng; và phải là 3 ký tự trở lên."
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2061,33 +2410,38 @@ msgstr ""
 "h�. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "Ch�n nhà cung cấp Mobile"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "Gá»­i"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "Gửi email đến địa chỉ này để đưa tin nhắn mới lên."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "Hãy gửi email cho tôi thông báo v� các đăng nhận mới."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Hãy gửi tin nhắn đến tôi qua Jabber hay GTalk"
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -2096,17 +2450,20 @@ msgstr ""
 "cho dịch vụ của chúng tôi. "
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Gửi những tin nhắn trả l�i của tôi từ những ngư�i mà tôi không theo qua "
 "Jabber/GTalk."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "�i�u chỉnh"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "�ã lưu các đi�u chỉnh."
 
@@ -2126,27 +2483,32 @@ msgid "Something weird happened."
 msgstr "Vài đi�u bất thư�ng xảy ra."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "Xin lỗi, không có địa chỉ email cho phép."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "Nguồn"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "Số liệu thống kê"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "Không tìm thấy OpenID."
 
@@ -2154,24 +2516,28 @@ msgstr "Không tìm thấy OpenID."
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "Theo bạn này"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Bạn này theo tôi"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "�ăng nhận được phép"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "�ăng nhận từ chối"
 
@@ -2179,28 +2545,35 @@ msgstr "�ăng nhận từ chối"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Tôi theo bạn này"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "Hệ thống xảy ra lỗi trong khi tải file."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "Từ khóa"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "Chuỗi bất kỳ"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Chuỗi cần tìm"
 
@@ -2220,6 +2593,7 @@ msgid "That confirmation code is not for you!"
 msgstr "Mã xác nhận này không phải của bạn!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 #, fuzzy
 msgid "That email address already belongs to another user."
 msgstr "�ịa chỉ email GTalk này đã có ngư�i khác sử dụng rồi."
@@ -2230,52 +2604,56 @@ msgid "That file is too big."
 msgstr "File quá lớn."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Tài khoản đó đã là tên tài khoản Jabber của bạn rồi."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 #, fuzzy
 msgid "That is already your email address."
 msgstr "Bạn đã dùng địa chỉ email này rồi"
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 #, fuzzy
 msgid "That is already your phone number."
 msgstr "�ó không phải là số điện thoại của bạn."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "�ây không phải Jabber ID của bạn."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 #, fuzzy
 msgid "That is not your email address."
 msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "�ó không phải là số điện thoại của bạn."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "Sai IM."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 #, fuzzy
 msgid "That is the wrong confirmation number."
 msgstr "�ó không phải là số điện thoại của bạn."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 #, fuzzy
 msgid "That phone number already belongs to another user."
 msgstr "�ịa chỉ email Yahoo này đã có ngư�i khác sử dụng rồi."
@@ -2283,15 +2661,21 @@ msgstr "�ịa chỉ email Yahoo này đã có ngư�i khác sử dụng rồi.
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Quá dài. Tối đa là 140 ký tự."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "Tin nhắn quá dài. Chỉ được phép tối đa 255 ký tự."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "�ịa chỉ \"%s\" đã được xác nhận từ tài khoản của bạn."
@@ -2300,11 +2684,14 @@ msgstr "Ä�ịa chỉ \"%s\" đã được xác nhận từ tài khoản của bá
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "�ã xóa địa chỉ."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2314,7 +2701,8 @@ msgstr ""
 "hướng dẫn chi tiết trên site để biết cách cho phép đăng ký. �ăng nhận token "
 "của bạn là:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2324,35 +2712,40 @@ msgstr ""
 "các hướng dẫn chi tiết trên site để "
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Có nhi�u ngư�i nghe theo l�i nhắn của %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Có nhi�u ngư�i nghe theo l�i nhắn của bạn."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Có nhi�u ngư�i gửi l�i nhắn để  %s nghe theo."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Có nhi�u ngư�i gửi l�i nhắn để bạn nghe theo."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Những ngư�i này đã là thành viên rồi và bạn chỉ cần nhấn nút \"Tôi theo "
 "ngư�i này\" để theo h�:"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Mã xác nhận quá cũ. Hãy thử lại cái khác."
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
@@ -2361,7 +2754,7 @@ msgstr ""
 "cung cấp OpenID của bạn."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2376,6 +2769,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
 
@@ -2384,25 +2780,37 @@ msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "Phương thức này yêu cầu là POST."
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Trang này không phải là phương tiện truy�n thông mà bạn chấp nhận."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Khu vá»±c"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2415,18 +2823,21 @@ msgstr ""
 "của bạn dưới đây."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL v� Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogging khác"
 
@@ -2438,15 +2849,22 @@ msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogg
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "Bất ng� gửi mẫu thông tin. "
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Bất ng� reset mật khẩu."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "Không tìm thấy action"
 
@@ -2477,38 +2895,47 @@ msgstr "Hết theo"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Không hỗ trợ cho version OMB"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "Không hỗ trợ kiểu file ảnh này."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "Thay đổi bởi SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Thay đổi bởi tin nhắn nhanh (IM)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Tải file"
 
@@ -2528,6 +2955,7 @@ msgid "Upload a new profile image"
 msgstr "Tải lên một file ảnh mới cho hồ sơ cá nhân"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -2535,7 +2963,9 @@ msgstr ""
 "của bạn tham gia vào dịch vụ này."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Chỉ dùng để cập nhật, thông báo, và hồi phục mật khẩu"
 
@@ -2559,11 +2989,16 @@ msgstr "Ngư�i dùng đang lắng nghe để không thoát kh�i."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "Ngư�i dùng không có thông tin."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Biệt hiệu của ngư�i dùng"
 
@@ -2572,29 +3007,33 @@ msgid "User not found."
 msgstr "Không tìm thấy user."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "Khu vực nào bạn thư�ng ở?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "Bạn đang làm gì thế, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Kiểu file ảnh không phù hợp với  '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Kích thước file ảnh không phù hợp đối với  '%s'"
@@ -2602,7 +3041,9 @@ msgstr "Kích thước file ảnh không phù hợp đối với  '%s'"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "Có"
 
@@ -2623,11 +3064,12 @@ msgid "You are already logged in!"
 msgstr "Bạn đã đăng nhập!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "Bạn đã theo những ngư�i này:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 #, fuzzy
 msgid "You are not friends with the specified user."
 msgstr "Bạn đã theo những ngư�i này:"
@@ -2646,7 +3088,7 @@ msgstr "Bạn có thể tạo tài khoản mới để có thể gửi ý kiến
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Bạn có thể nhận tin nhắn SMS qua email từ %%site.name%%."
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
@@ -2655,6 +3097,7 @@ msgstr ""
 "\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2663,7 +3106,8 @@ msgstr ""
 "Bạn có thể gửi và nhận những tin nhắn qua Jabber hoặc GTalk [tin nhắn nhanh]"
 "(%%doc.im%%). �ịnh dạng địa chỉ của bạn và các thiết lập sau."
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2674,21 +3118,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "Bạn có thể đăng ký tại nơi bạn ở!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "Bạn không thể đăng ký nếu không đồng ý các đi�u khoản."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2710,16 +3156,19 @@ msgstr ""
 "%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "Bạn đã không xóa trạng thái của những ngư�i khác."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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!"
@@ -2727,20 +3176,21 @@ msgstr ""
 "Bạn sẽ nhận được thông báo khi những ngư�i được bạn m�i nhận l�i m�i và đăng "
 "ký vào trang web này. Cảm ơn bạn "
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Bạn đã được xác định. Hãy nhập mật khẩu mới ở dưới."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "OpenID URL của bạn"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Biệt hiệu của bạn đã tồn tại hoặc bạn đã đăng ký bằng email này rồi."
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2749,47 +3199,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) đăng nhập nhi�u website với cùng 1 tài khoản. Quản "
 "lý các OpenID của bạn ở đây."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "vài giây trước"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "%d ngày trước"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d gi� trước"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d phút trước"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "%d tháng trước"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "1 ngày trước"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "1 phút trước"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "1 tháng trước"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "1 năm trước"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "1 gi� trước"
 
@@ -2811,12 +3271,14 @@ msgid "reply"
 msgstr "trả l�i"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "cùng mật khẩu ở trên"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 #, fuzzy
 msgid "unsupported file type"
 msgstr "Không hỗ trợ kiểu file ảnh này."
@@ -2839,6 +3301,26 @@ msgstr "Sau"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
 
@@ -2848,6 +3330,7 @@ msgid "This notice is not a favorite!"
 msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 #, fuzzy
 msgid "Could not delete favorite."
 msgstr "Không thể tạo favorite."
@@ -2857,24 +3340,30 @@ msgstr "Không thể tạo favorite."
 msgid "Favor"
 msgstr "Ưa thích"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Gửi email thông báo tôi khi có ai đó lưu tin nhắn của tôi vào danh sách ưa "
 "thích của h�."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "Không thể tạo favorite."
 
@@ -2884,11 +3373,13 @@ msgstr "Không thích"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s ưa thích các tin nhắn"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, fuzzy, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
@@ -2933,36 +3424,47 @@ msgid "Login with your username and password. "
 msgstr "Sai tên đăng nhập hoặc mật khẩu."
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 #, fuzzy
 msgid "That's too long. Max message size is 140 chars."
 msgstr "Quá dài. Tối đa là 140 ký tự."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 #, fuzzy
 msgid "You can't send a message to this user."
 msgstr "Bạn đã theo những ngư�i này:"
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 #, fuzzy
 msgid "No such user"
 msgstr "Không có user nào."
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 #, fuzzy
 msgid "New message"
 msgstr "Tin mới nhất"
@@ -3036,6 +3538,11 @@ msgstr ""
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 #, fuzzy
 msgid "User without matching profile"
 msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
@@ -3070,6 +3577,8 @@ msgid "New password successfully saved. "
 msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây gi�."
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 #, fuzzy
 msgid "Password must be 6 or more characters."
 msgstr "Mật khẩu phải nhi�u hơn 6 ký tự."
@@ -3094,12 +3603,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Không thể lấy lại các tin nhắn ưa thích"
 
@@ -3107,7 +3619,7 @@ msgstr "Không thể lấy lại các tin nhắn ưa thích"
 msgid "No such message."
 msgstr "Không có tin nhắn nào."
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 #, fuzzy
 msgid "Only the sender and recipient may read this message."
 msgstr "Chỉ có ngư�i gửi hoặc ngư�i nhận mới có thể xem tin nhắn này"
@@ -3133,54 +3645,73 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, fuzzy, php-format
 msgid "Direct messages to %s"
 msgstr "Tin nhắn riêng"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 #, fuzzy
 msgid "Direct Messages You've Sent"
 msgstr "Tin nhắn riêng"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, fuzzy, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Bạn có tin nhắn riêng từ %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 #, fuzzy
 msgid "No message text!"
 msgstr "Không có tin nhắn nào."
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 #, fuzzy
 msgid "Recipient user not found."
 msgstr "Không tìm thấy user."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, fuzzy, php-format
 msgid "%s / Favorites from %s"
 msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, fuzzy, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "Tất cả các cập nhật của %s"
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
@@ -3191,7 +3722,8 @@ msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
-msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich\n"
+msgstr ""
+"%s da them tin nhan cua ban vao danh sach tin nhan ua thich\n"
 "\n"
 
 #: actions/twittersettings.php:27
@@ -3203,14 +3735,17 @@ msgstr ""
 "bạn cũng có thể  đăng ký theo các bạn của mình trên Twitter tại đây."
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Thiết lập tài khoản Twitter"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Tài khoản Twitter"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "Tài khoản Twitter đã được xác nhận."
 
@@ -3219,6 +3754,7 @@ msgid "Twitter Username"
 msgstr "Tên tài khoản Twitter"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "Không nhập ký tự trắng."
 
@@ -3227,18 +3763,22 @@ msgid "Twitter Password"
 msgstr "Mật khẩu Twitter"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "Tự động gửi tin nhắn của tôi đến Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "�ăng ký theo những bạn trên Twitter tại đây."
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 #, fuzzy
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
@@ -3248,6 +3788,7 @@ msgstr ""
 "gạch dưới (_)."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "Không thể xác nhận tài khoản Twitter của bạn!"
 
@@ -3258,34 +3799,44 @@ msgstr "Không thể lấy thông tin tài khoản của '%s' từ Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "Không thể lưu thông tin Twitter của bạn!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 #, fuzzy
 msgid "Twitter settings saved."
 msgstr "Thiết lập tài khoản Twitter"
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "Không phải là tài khoản Twitter của bạn."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "Không thể xóa tài khoản Twitter."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Tài khoản Twitter đã xóa."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "Không thể lưu các yêu cầu cho tài khoản Twitter. "
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Các yêu cầu cho tài khoản Twitter đã lưu"
 
@@ -3304,20 +3855,21 @@ msgid "The subscription has been rejected, but no "
 msgstr "�ăng nhận từ chối"
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 #, fuzzy
 msgid "Command results"
 msgstr "Không có kết quả nào"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 #, fuzzy
 msgid "Command failed"
 msgstr " và bạn bè"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3327,94 +3879,116 @@ msgid "Subscriptions: %1$s\n"
 msgstr "Tôi theo: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 #, fuzzy
 msgid "User has no last notice"
 msgstr "Ngư�i dùng không có thông tin."
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 #, fuzzy
 msgid "Notice marked as fave."
 msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, fuzzy, php-format
 msgid "%1$s (%2$s)"
 msgstr "%s (%s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, fuzzy, php-format
 msgid "Fullname: %s"
 msgstr "Tên đầy đủ"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, fuzzy, php-format
 msgid "Location: %s"
 msgstr "Thành phố: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, fuzzy, php-format
 msgid "Homepage: %s"
 msgstr "Trang chủ hoặc Blog: %s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, fuzzy, php-format
 msgid "About: %s"
 msgstr "Giới thiệu"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, fuzzy, php-format
 msgid "Direct message to %s sent"
 msgstr "Tin nhắn riêng"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "Thư bạn đã gửi"
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, fuzzy, php-format
 msgid "Subscribed to %s"
 msgstr "Theo nhóm này"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, fuzzy, php-format
 msgid "Unsubscribed from %s"
 msgstr "Hết theo"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 #, fuzzy
 msgid "Notification off."
 msgstr "Không có mã số xác nhận."
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 #, fuzzy
 msgid "Notification on."
 msgstr "Không có mã số xác nhận."
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3422,12 +3996,12 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 #, fuzzy
 msgid "Could not insert message."
 msgstr "Không thể chèn thêm vào đăng nhận."
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 #, fuzzy
 msgid "Could not update message with new URI."
 msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
@@ -3444,7 +4018,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "Bạn có tin nhắn riêng từ %s"
@@ -3456,7 +4030,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3465,31 +4039,39 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "Ưa thích"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Những tin nhắn ưa thích của %s"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "Hộp thư đến"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "Thư đến của bạn"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "Há»™p thÆ° Ä‘i"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "Thư bạn đã gửi"
 
@@ -3503,15 +4085,20 @@ msgid "Twitter integration options"
 msgstr "Các lựa ch�n để tích hợp với Twitter "
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 #, fuzzy
 msgid "Could not parse message."
 msgstr "Không thể cập nhật thành viên."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s và bạn bè"
@@ -3524,21 +4111,31 @@ msgstr ""
 "v� bạn."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Thay đổi hình đại diện"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Xem trÆ°á»›c"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 #, fuzzy
 msgid "Crop"
 msgstr "Nhóm"
@@ -3557,37 +4154,46 @@ msgid "There was a problem with your session token. "
 msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "Không có tin nhắn nào."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 #, fuzzy
 msgid "Unknown file type"
 msgstr "Không hỗ trợ kiểu file ảnh này."
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 #, fuzzy
 msgid "No profile with that ID."
 msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "Ban user"
@@ -3597,12 +4203,12 @@ msgstr "Ban user"
 msgid "Are you sure you want to block this user? "
 msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 #, fuzzy
 msgid "You have already blocked this user."
 msgstr "Bạn đã theo những ngư�i này:"
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3621,42 +4227,60 @@ msgstr "Bạn muốn xóa tin nhắn này? Sau khi xóa, bạn không thể lấ
 msgid "Add to favorites"
 msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, fuzzy, php-format
 msgid "Edit %s group"
 msgstr "%s và nhóm"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 #, fuzzy
 msgid "You must be logged in to create a group."
 msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "Không có biệt hiệu."
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "Không có user nào."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 #, fuzzy
 msgid "You must be an admin to edit the group"
 msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3666,16 +4290,17 @@ msgid "Nickname must have only lowercase letters "
 msgstr "Biệt hiệu phải là chữ viết thư�ng hoặc số và không có khoảng trắng."
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "Lý lịch quá dài (không quá 140 ký tự)"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "Không thể cập nhật thành viên."
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 #, fuzzy
 msgid "Options saved."
 msgstr "�ã lưu các đi�u chỉnh."
@@ -3695,7 +4320,8 @@ msgstr "Dia chi email moi de gui tin nhan den %s"
 msgid "Send me email when someone "
 msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3711,7 +4337,7 @@ msgstr ""
 "Mã xác nhận đã được gửi đến địa chỉ IM. Bạn phải chấp nhận %s để có thể gửi "
 "tin nhắn đến bạn."
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3725,55 +4351,70 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "Không có nội dung!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 #, fuzzy
 msgid "After"
 msgstr "Sau"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "TrÆ°á»›c"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 #, fuzzy
 msgid "Invitations have been sent to the following users:"
 msgstr "Thư m�i đã gửi đến:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, fuzzy, php-format
 msgid "You have been invited to %s"
 msgstr "Bạn đã được xác định. Hãy nhập mật khẩu mới ở dưới."
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "M�i bạn bè"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3822,13 +4463,15 @@ msgstr ""
 msgid "Sync preferences"
 msgstr "Tính năng"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 #, fuzzy
 msgid "Disfavor favorite"
 msgstr "Không thích"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "Các tin nhắn bị cảnh báo"
@@ -3844,7 +4487,8 @@ msgid "The most popular notices on the site right now."
 msgstr "Các từ khóa phổ biến."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3858,15 +4502,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 #, fuzzy
 msgid "Group logo"
 msgstr "Mã nhóm"
@@ -3875,12 +4521,14 @@ msgstr "Mã nhóm"
 msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "Hình đại diện đã được cập nhật."
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "Cập nhật hình đại diện không thành công."
@@ -3900,7 +4548,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 #, fuzzy
 msgid "Groups"
 msgstr "Nhóm"
@@ -3916,6 +4565,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "Tạo nhóm"
@@ -3928,7 +4578,7 @@ msgstr ""
 "Tìm kiếm những ngư�i trên %%site.name%% bằng tên, vị trí, hoặc sở thích của "
 "h�. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
 msgid "Group search"
 msgstr "Tìm kiếm nhi�u ngư�i"
@@ -3953,22 +4603,22 @@ msgstr "Hãy gửi tin nhắn đến tôi qua Jabber/GTalk."
 msgid "A confirmation code was sent "
 msgstr "Không có mã số xác nhận."
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 #, fuzzy
 msgid "You must be logged in to join a group."
 msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Bạn đã theo những ngư�i này:"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, fuzzy, php-format
 msgid "%s joined group %s"
 msgstr "%s và nhóm"
@@ -3977,17 +4627,20 @@ msgstr "%s và nhóm"
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 #, fuzzy
 msgid "You must be logged in to leave a group."
 msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "Không có tin nhắn nào."
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "Bạn chưa cập nhật thông tin riêng"
@@ -3997,22 +4650,26 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
 msgid "You may not leave a group while you are its administrator."
 msgstr "Bạn đã không xóa trạng thái của những ngư�i khác."
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 #, fuzzy
 msgid "Could not find membership record."
 msgstr "Không thể cập nhật thành viên."
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, fuzzy, php-format
 msgid "%s left group %s"
 msgstr "%s và nhóm"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -4025,16 +4682,18 @@ msgstr ""
 msgid "New group"
 msgstr "Tạo nhóm"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "Không thể tạo favorite."
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Không thể tạo đăng nhận."
@@ -4049,12 +4708,15 @@ msgstr "File quá lớn."
 msgid "Don't send a message to yourself; "
 msgstr "Bạn đã theo những ngư�i này:"
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 #, fuzzy
 msgid "Notice posted"
 msgstr "Tin đã gửi"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 #, fuzzy
 msgid "Ajax Error"
 msgstr "Lá»—i"
@@ -4074,7 +4736,7 @@ msgstr "Tin đã gửi"
 msgid "Nudge sent!"
 msgstr "Tin đã gửi"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "�ăng nhập OpenID"
@@ -4102,11 +4764,13 @@ msgstr ""
 msgid "Service"
 msgstr "Tìm kiếm"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
@@ -4116,17 +4780,18 @@ msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 msgid "Change your password."
 msgstr "Thay đổi mật khẩu của bạn"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "�ã lưu mật khẩu."
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "�ịa chỉ email không hợp lệ."
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -4136,12 +4801,13 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "Hồ sơ này không biết"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4152,21 +4818,26 @@ msgid "Automatically subscribe to whoever "
 msgstr "Tự động theo những ngư�i nào đăng ký theo tôi"
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Trang chủ '%s'  không hợp lệ"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "Không thể lưu hồ sơ cá nhân."
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "Dòng tin công cộng"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "Không thể lấy lại các tin nhắn ưa thích"
@@ -4188,11 +4859,13 @@ msgstr "Dòng tin công cộng"
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4251,7 +4924,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "Trả l�i cho %s"
@@ -4261,53 +4935,74 @@ msgstr "Trả l�i cho %s"
 msgid "%s favorite notices, page %d"
 msgstr "%s ưa thích các tin nhắn"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, fuzzy, php-format
 msgid "%s group"
 msgstr "%s và nhóm"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "Thông tin nhóm"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "Tin nhắn"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 #, fuzzy
 msgid "Group actions"
 msgstr "Mã nhóm"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "Dòng tin nhắn cho %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 msgid "Members"
 msgstr "Thành viên"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 #, fuzzy
 msgid "All members"
 msgstr "Thành viên"
@@ -4324,7 +5019,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr "Chỉ có ngư�i gửi hoặc ngư�i nhận mới có thể xem tin nhắn này"
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "Hộp thư đến của %s - trang %d"
@@ -4335,35 +5030,42 @@ msgid "'s profile"
 msgstr "Hồ sơ"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "Hồ sơ"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 #, fuzzy
 msgid "User actions"
 msgstr "Không tìm thấy action"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 #, fuzzy
 msgid "Send a direct message to this user"
 msgstr "Bạn đã theo những ngư�i này:"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 #, fuzzy
 msgid "Message"
 msgstr "Tin mới nhất"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "Bạn này theo tôi"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 #, fuzzy
 msgid "All groups"
 msgstr "Nhóm"
@@ -4390,7 +5092,7 @@ msgstr "Hãy gửi tin nhắn đến tôi qua Jabber hay GTalk"
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "�ó không phải là số điện thoại của bạn."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Ch�n nhà cung cấp Mobile"
@@ -4455,17 +5157,18 @@ msgstr "Có nhi�u ngư�i gửi l�i nhắn để  %s nghe theo."
 msgid "These are the people whose "
 msgstr "Có nhi�u ngư�i nghe theo l�i nhắn của %s."
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "Không có Jabber ID."
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Dòng tin nhắn cho %s"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4490,7 +5193,7 @@ msgstr "Từ khóa"
 msgid "Tag user"
 msgstr "Từ khóa"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4501,17 +5204,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "Không thể lưu hồ sơ cá nhân."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4520,20 +5223,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "Không có tin nhắn nào."
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "Microblog bởi  %s"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "Không tìm thấy"
@@ -4545,17 +5251,18 @@ msgstr ""
 "Hãy đăng ký tài khoản Twitter của bạn để có thể gửi tin nhắn đến Twitter, "
 "bạn cũng có thể  đăng ký theo các bạn của mình trên Twitter tại đây."
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 #, fuzzy
 msgid "Twitter user name"
 msgstr "Tên tài khoản Twitter"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 #, fuzzy
 msgid "Twitter password"
 msgstr "Mật khẩu Twitter"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 #, fuzzy
 msgid "Twitter Friends"
 msgstr "Thiết lập tài khoản Twitter"
@@ -4569,159 +5276,168 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr "Không thể lấy thông tin tài khoản của '%s' từ Twitter."
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "Lỗi xảy ra khi lưu thành viên."
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "Không có URL cho hồ sơ để quay v�."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 #, fuzzy
 msgid "No profile with that id."
 msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Hết theo"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, fuzzy, php-format
 msgid "%s groups"
 msgstr "%s và nhóm"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr ""
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 #, fuzzy
 msgid "Upload an avatar"
 msgstr "Cập nhật hình đại diện không thành công."
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 #, fuzzy
 msgid "Other"
 msgstr "Sau"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr ""
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Account"
 msgstr "Giới thiệu"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "Thay đổi mật khẩu của bạn"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "Tạo tài khoản mới"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "Không có OpenID nào."
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "Hướng dẫn"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "Thông báo mới"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "Thông báo mới"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Tôi theo"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "Ban user"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr ""
 
@@ -4735,12 +5451,15 @@ msgstr "cảnh báo tin nhắn"
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "Tạo tài khoản mới"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 #, fuzzy
 msgid "Published"
 msgstr "Công cộng"
@@ -4762,34 +5481,39 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 #, fuzzy
 msgid "Tag"
 msgstr "Từ khóa"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL v� Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Mô tả"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "Nói v� những sở thích của nhóm trong vòng 140 ký tự"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4799,21 +5523,21 @@ msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
 msgid "Group"
 msgstr "Nhóm"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 #, fuzzy
 msgid "Logo"
 msgstr "Thoát"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
@@ -4847,12 +5571,12 @@ msgstr "�ăng nhập"
 msgid "Leave"
 msgstr "LÆ°u"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Sai tên đăng nhập hoặc mật khẩu."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Tạo tài khoản mới"
@@ -4873,24 +5597,24 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "Thành phố: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Trang chủ hoặc Blog: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
@@ -4905,46 +5629,54 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 #, fuzzy
 msgid "From"
 msgstr " từ"
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "Xóa tin nhắn"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "Thông báo mới"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "Nhi�u hơn 6 ký tự"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 #, fuzzy
 msgid "in reply to"
 msgstr "còn nữa..."
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Trả l�i tin nhắn này"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Trả l�i"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Xóa tin nhắn"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete"
 msgstr "Xóa tin nhắn"
@@ -4969,29 +5701,31 @@ msgstr "Bạn đã theo những ngư�i này:"
 msgid "Tags in %s's notices"
 msgstr "cảnh báo tin nhắn"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Công cộng"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 #, fuzzy
 msgid "User groups"
 msgstr "Hồ sơ"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 #, fuzzy
 msgid "Recent tags"
 msgstr "Các từ khóa hiện tại"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "Tên tài khoản"
@@ -5010,34 +5744,36 @@ msgstr "Tìm kiếm m�i ngư�i trên trang web này"
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "�ăng nhận từ xa"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Theo nhóm này"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 "�i�n địa chỉ email và nội dung tin nhắn để gửi thư m�i bạn bè và đồng nghiệp "
 "của bạn tham gia vào dịch vụ này."
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Ngư�i dùng không có thông tin."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "Theo nhóm này"
@@ -5053,10 +5789,11 @@ msgid "Top posters"
 msgstr "Top posters"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr "B� chặn ngư�i dùng này"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "B� chặn"
 
@@ -5064,722 +5801,2112 @@ msgstr "B� chặn"
 msgid "Unsubscribe from this user"
 msgstr "Ngừng đăng ký từ ngư�i dùng này"
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Ch�n những ngư�i bạn của %s"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Ch�n những ngư�i bạn của %s"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Ch�n những ngư�i bạn của %s"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s và bạn bè"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để m�i ngư�i có thể biết thông tin "
+"v� bạn."
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Hình đại diện đã được cập nhật."
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr "Bạn muốn xóa tin nhắn này? Sau khi xóa, bạn không thể lấy lại được."
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "Microblog bởi  %s"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"Tìm kiếm những ngư�i trên %%site.name%% bằng tên, vị trí, hoặc sở thích của "
+"h�. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "Thư bạn đã gửi"
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Tìm dòng thông tin cho \"%s\""
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
+"đổi trong đi�u chỉnh."
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Dòng tin công cộng"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Dòng tin công cộng"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Dòng tin công cộng"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại"
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Tạo"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "Thông tin nhóm"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "Hồ sơ"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Hộp thư đi của %s"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Hình đại diện"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Mã xác nhận đã được gửi tới địa chỉ email của bạn. Hãy kiểm tra hộp thư và "
+"làm theo hướng dẫn."
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+"%1$s vừa thêm tin nhắn của bạn trên %2$s vào danh sách tin nhắn ưa thích của "
+"mình.\n"
+"\n"
+"Bạn có thể xem lại nội dung tin nhắn của bạn tại đây:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Bạn có thể xem danh sách tin nhắn ưa thích của %1$s tại đây: \n"
+"\n"
+"%4$s\n"
+"\n"
+"Chúc sức kh�e,\n"
+"%5$s\n"
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "Không có user nào."
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Hãy đăng ký tài khoản Twitter của bạn để có thể gửi tin nhắn đến Twitter, "
+"bạn cũng có thể  đăng ký theo các bạn của mình trên Twitter tại đây."
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "Không thể lấy thông tin tài khoản của '%s' từ Twitter."
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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 ""
+"Vui lòng kiểm tra các chi tiết để chắc chắn rằng bạn muốn đăng nhận xem tin "
+"nhắn của các thành viên này. Nếu bạn không yêu cầu đăng nhận xem tin nhắn "
+"của h�, hãy nhấn \"Hủy b�\""
+
+#: actions/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Tin đã gửi"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr ""
+"Bạn đã có tài khoản rồi, hãy đăng nhập bằng tên đăng nhập và mật khẩu để kết "
+"nối với OpenId của bạn."
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, fuzzy, 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 ""
+"Chào, %1$s .\n"
+"\n"
+"Không biết có phải bạn là ngư�i vừa nhập địa chỉ email này trên %2$s.\n"
+"\n"
+"Nếu bạn là ngư�i nhập, và bạn muốn xác nhận lại, hãy nhấn chuột vào đư�ng "
+"dẫn dưới đây: \n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Nếu không phải bạn, hãy b� qua tin nhắn này.\n"
+"\n"
+"Cảm ơn bạn đã b� th�i gian để đ�c thư,\n"
+"\n"
+"%4$s\n"
+"\n"
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s đang theo dõi các tin nhắn của bạn trên %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Ngư�i bạn trung thành của bạn,\n"
+"%4$s.\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+"%1$s (%2$s) đã gửi đến bạn tin nhắn riêng:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Bạn có thể trả l�i tại:\n"
+"\n"
+"%4$s\n"
+"\n"
+"�ừng trả l�i lại thư này; sẽ không có ai nhận thư.\n"
+"\n"
+"Chúc sức kh�e,\n"
+"%5$s\n"
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Tìm kiếm"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Không có tài liệu nào."
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Ban user"
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Hồ sơ"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s và bạn bè"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "B� chặn ngư�i dùng này"
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Không có mã số xác nhận."
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Không thể xóa tin nhắn này."
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Trang chủ '%s'  không hợp lệ"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Không thể tạo favorite."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Thông báo mới"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Thông báo mới"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "Biệt hiệu không hợp lệ."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Ngư�i dùng không có thông tin."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Ban user"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Nhóm"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Không thể cập nhật thành viên."
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Không thể lưu thông tin Twitter của bạn!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Các tính năng đã được lưu."
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make this user an admin"
+msgstr "Kênh mà bạn tham gia"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Không có kết quả nào"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Ngư�i dùng không có thông tin."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Tin mới nhất"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) đăng nhập nhi�u website với cùng 1 tài khoản. Quản "
+"lý các OpenID của bạn ở đây."
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr ""
+"Nếu bạn đã quên hoặc mất mật khẩu, bạn có thể tạo mới và được gửi đến địa "
+"chỉ email lưu trong tài khoản của bạn."
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "Bạn đã được xác định. Hãy nhập mật khẩu mới ở dưới."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "Yêu cầu khôi phục lại mật khẩu đã được gửi"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Lỗi xảy ra với mã xác nhận."
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Theo nhóm này"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s ưa thích các tin nhắn"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "Không có user nào."
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Thông báo được gắn thẻ %s"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Không thể lấy lại các tin nhắn ưa thích"
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Không tìm thấy bất kỳ trạng thái nào."
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Các cập nhật đang trả l�i tới %2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Tất cả đăng nhận"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "%s chào mừng bạn "
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "Hồ sơ"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Hồ sơ "
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+#, fuzzy
+msgid "Change background image"
+msgstr "Background Theme:"
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Tải file"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+#, fuzzy
+msgid "Tile background image"
+msgstr "Background Theme:"
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Thay đổi mật khẩu của bạn"
+
+#: lib/designsettings.php:178
+#, fuzzy
+msgid "Background"
+msgstr "Background Theme:"
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Kết nối"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Tìm kiếm"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "�ăng nhập"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+#, fuzzy
+msgid "Save design"
+msgstr "LÆ°u"
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "Ban user"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Ban user"
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/mail.php:556
+#, fuzzy, php-format
+msgid ""
+"%1$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 ""
+"%1$s vừa thêm tin nhắn của bạn trên %2$s vào danh sách tin nhắn ưa thích của "
+"mình.\n"
+"\n"
+"Bạn có thể xem lại nội dung tin nhắn của bạn tại đây:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Bạn có thể xem danh sách tin nhắn ưa thích của %1$s tại đây: \n"
+"\n"
+"%4$s\n"
+"\n"
+"Chúc sức kh�e,\n"
+"%5$s\n"
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
 #, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "Không thể tạo favorite."
+msgid "in context"
+msgstr "Không có nội dung!"
 
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Tạo tài khoản mới"
+msgid "Search help"
+msgstr "Tìm kiếm"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Trang chủ không phải là URL"
 
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
 #, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Không thể xóa email xác nhận."
+msgid "No such page"
+msgstr "Không có tin nhắn nào."
 
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Tin nhắn riêng"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Quá dài. Tối đa là 140 ký tự."
+
+#: actions/apifriendshipsdestroy.php:109
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+msgid "Could not unfollow user: User not found."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Lý lịch quá dài (không quá 140 ký tự)"
+
+#: actions/apigroupjoin.php:110
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Tìm theo nội dung của tin nhắn"
+msgid "You are already a member of that group."
+msgstr "Bạn đã theo những ngư�i này:"
 
-#~ msgid " Required."
-#~ msgstr " Bắt buộc."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Không thể xác nhận địa chỉ email."
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Lỗi xảy ra khi thêm mới tin nhắn"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
 
-#~ msgid "FAQ "
-#~ msgstr "FAQ - H�i đáp"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s và nhóm"
 
-#~ 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 ""
-#~ "Microblogging [StatusNet](http://status.net/), version %s đã có ở [GNU "
-#~ "Affero General Public License] (http://www.fsf.org/licensing/licenses/"
-#~ "agpl-3.0.html)."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#~ msgid ""
-#~ "Login with your username and password. Don't have a username yet? "
-#~ "[Register](%%action.register%%) a new account."
-#~ msgstr ""
-#~ "Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. Nếu bạn chưa có tài "
-#~ "khoản, [hãy đăng ký](%%action.register%%) tài khoản mới."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Mã nhóm"
 
-#~ msgid "Password recovery requested "
-#~ msgstr "Yeu cau khoi phuc lai mat khau da duoc gui"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Hình đại diện đã được cập nhật."
 
-#~ msgid "%s, Tell the world what's on your mind?"
-#~ msgstr "%s, bạn đang làm gì?"
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
 
-#~ msgid "City, State/Region, Country"
-#~ msgstr "Thành phố, Tỉnh thành, Quốc gia"
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Quá dài. Tối đa là 140 ký tự."
 
-#~ msgid "Register for a free account!"
-#~ msgstr "�ăng ký tài khoản miễn phí!"
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#~ msgid "Everyone"
-#~ msgstr "Tất cả m�i ngư�i"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Không hỗ trợ kiểu file ảnh này."
 
-#~ msgid "Welcome to %s"
-#~ msgstr "%s chào mừng bạn "
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
 
-#~ msgid "Blog + Chat = Fun"
-#~ msgstr "Vừa Blog vừa Chat = Vui Lắm"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Lý lịch quá dài (không quá 140 ký tự)"
 
-#~ msgid ""
-#~ "%s is a new way to send short messages to your friends, family, and co-"
-#~ "workers."
-#~ msgstr ""
-#~ "%s là dịch vụ cho bạn bè, gia đình và đồng nghiệp liên lạc và kết nối qua "
-#~ "những trao đổi ngắn."
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Dòng tin nhắn cho %s"
 
-#~ msgid ""
-#~ "Starting a conversation is fast and easy: You can shout messages to your "
-#~ "followers, or whisper to your friends. Just think of something to say, "
-#~ "and get started!"
-#~ msgstr ""
-#~ "�ể bắt đầu cuộc đàm luận: Bạn có thể gửi tin nhắn đến những ngư�i mà bạn "
-#~ "theo, hoặc gửi những mong ước của bạn đến bạn bè, những câu trả l�i thông "
-#~ "thư�ng cho một câu h�i đơn giản: Bạn đang làm gì vậy? "
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Ngư�i dùng đang lắng nghe để không thoát kh�i."
 
-#~ msgid "Register now!"
-#~ msgstr "Hãy đăng ký ngay!"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Chưa được phép."
 
-#~ msgid "What's the latest?"
-#~ msgstr "M�i ngư�i đang nói gì?"
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Không thể chuyển các token yêu cầu đến token truy cập."
 
-#~ msgid "What Everyone Is Talking About"
-#~ msgstr "M�i ngư�i đang nói gì?"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Không biết phiên bản của giao thức OMB."
 
-#~ msgid ""
-#~ "Send me replies through Jabber/GTalk from people I’m not subscribed to."
-#~ msgstr "Gửi tin nhắn trả l�i những ngư�i mà tôi không đăng ký qua "
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Không có tin nhắn nào."
 
-#~ msgid ""
-#~ "You can change the theme as you want by clicking a thumbnail image and "
-#~ "then click Save button to active new theme."
-#~ msgstr ""
-#~ "Bạn có thể thay đổi theme bằng cách ch�n vào một hình ảnh theme bạn "
-#~ "thích. Sau đó nhấn nút Lưu để thay đổi theme mới."
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Không có tin nhắn nào."
 
-#~ msgid "Choose a theme"
-#~ msgstr "Ch�n theme"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Dòng tin nhắn cho %s"
 
-#~ msgid "Theme Error"
-#~ msgstr "Lá»—i Theme"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Trang này không phải là phương tiện truy�n thông mà bạn chấp nhận."
 
-#~ msgid ""
-#~ "Tired of the same old colors on your timeline? Change is good so spice up "
-#~ "your %s page."
-#~ msgstr ""
-#~ "Nếu cảm thấy nhàm chán với màu sắc cũ trên timeline của bạn, hãy thay đổi "
-#~ "màu sắc để trang %s của bạn hấp dẫn hơn."
-
-#~ msgid "Background Theme:"
-#~ msgstr "Background Theme:"
-
-#~ msgid "Customize your theme"
-#~ msgstr "Tùy chỉnh theme "
-
-#~ msgid "Timeline Theme:"
-#~ msgstr "Timeline Theme:"
-
-#~ msgid "Dashboard Theme:"
-#~ msgstr "Dashboard Theme:"
-
-#~ msgid "Theme"
-#~ msgstr "Theme"
-
-#~ msgid "Activity"
-#~ msgstr "Các hoạt động"
-
-#~ msgid "Me & My Friends"
-#~ msgstr "Tôi & bạn"
-
-#~ msgid "User & Friends"
-#~ msgstr "Nhóm bạn"
-
-#~ msgid "My Profile"
-#~ msgstr "Cá nhân"
-
-#~ msgid "Customize your page even more with CSS"
-#~ msgstr "Tùy chỉnh trang của bạn bằng CSS"
-
-#~ msgid "Save Changes"
-#~ msgstr "LÆ°u"
-
-#~ msgid "Change css code"
-#~ msgstr "Thay đổi code css"
-
-#~ msgid "You can change your css code here."
-#~ msgstr "Bạn có thể thay đổi code css"
-
-#~ msgid "New css code saved."
-#~ msgstr "CSS đã được lưu."
-
-#~ msgid "Upload from your computer"
-#~ msgstr "Tải từ máy tính cá nhân  "
-
-#~ msgid "Get from library"
-#~ msgstr "Lấy từ tập ảnh có sẵn"
-
-#~ msgid "Male"
-#~ msgstr "Nam"
-
-#~ msgid "Female"
-#~ msgstr "Nữ"
-
-#~ msgid "No reply yet"
-#~ msgstr "chưa có trả l�i"
-
-#~ msgid "replies"
-#~ msgstr "trả l�i"
-
-#~ msgid ""
-#~ "%1$s just added your notice from %2$s as one of their favorites.\n"
-#~ "\n"
-#~ "In case you forgot, you can see the text of your notice here:\n"
-#~ "\n"
-#~ "%3$s\n"
-#~ "\n"
-#~ "You can see the list of %1$s's favorites here:\n"
-#~ "\n"
-#~ "%4$s\n"
-#~ "\n"
-#~ "Faithfully yours,\n"
-#~ "%5$s\n"
-#~ msgstr ""
-#~ "%1$s vừa thêm tin nhắn của bạn trên %2$s vào danh sách tin nhắn ưa thích "
-#~ "của mình.\n"
-#~ "\n"
-#~ "Bạn có thể xem lại nội dung tin nhắn của bạn tại đây:\n"
-#~ "\n"
-#~ "%3$s\n"
-#~ "\n"
-#~ "Bạn có thể xem danh sách tin nhắn ưa thích của %1$s tại đây: \n"
-#~ "\n"
-#~ "%4$s\n"
-#~ "\n"
-#~ "Chúc sức kh�e,\n"
-#~ "%5$s\n"
-
-#~ msgid "Flag a notice"
-#~ msgstr "Cảnh báo tin nhắn"
-
-#~ msgid ""
-#~ "If you think this notice is an offensive message, please notify to the "
-#~ "administrator. Thank you."
-#~ msgstr ""
-#~ "Nếu bạn nghĩ tin nhắn này có nội dung xấu không chấp nhận được, hãy báo "
-#~ "cho ban quản trị web site. Cảm ơn rất nhi�u."
-
-#~ msgid ""
-#~ "To use this [Saigonica version](%%doc.source%%), you must write the "
-#~ "license is of StatusNet and has contributions from Saigonica."
-#~ msgstr ""
-#~ "�ể sử dụng [phiên bản Saigonica](%%doc.source%%) này, cần ghi rõ bản "
-#~ "quy�n của Laconia cộng thêm sự đóng góp của Saigonica."
-
-#~ msgid "Change theme"
-#~ msgstr "�ổi theme"
-
-#~ msgid "Customize theme"
-#~ msgstr "Tùy chỉnh theme"
-
-#~ msgid ""
-#~ "You can change the theme as you want by choosing a thumbnail and then "
-#~ "click Save button to active new theme."
-#~ msgstr ""
-#~ "Bạn có thể thay đổi theme bằng cách ch�n một hình mẫu của các theme rồi "
-#~ "nhấn nút \"Lưu\" để đổi theme. "
-
-#~ msgid ""
-#~ "Hey, %1$s .\n"
-#~ "\n"
-#~ "Someone just entered this email address on %2$s.\n"
-#~ "\n"
-#~ "If it was you, and you want to confirm your entry, use the URL below: \n"
-#~ "\n"
-#~ "\t%3$s\n"
-#~ "\n"
-#~ "If not, just ignore this message.\n"
-#~ "\n"
-#~ "Thanks for your time,\n"
-#~ "\n"
-#~ "%4$s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Chào, %1$s .\n"
-#~ "\n"
-#~ "Không biết có phải bạn là ngư�i vừa nhập địa chỉ email này trên %2$s.\n"
-#~ "\n"
-#~ "Nếu bạn là ngư�i nhập, và bạn muốn xác nhận lại, hãy nhấn chuột vào đư�ng "
-#~ "dẫn dưới đây: \n"
-#~ "\n"
-#~ "\t%3$s\n"
-#~ "\n"
-#~ "Nếu không phải bạn, hãy b� qua tin nhắn này.\n"
-#~ "\n"
-#~ "Cảm ơn bạn đã b� th�i gian để đ�c thư,\n"
-#~ "\n"
-#~ "%4$s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "%1$s: confirm you own this phone number with this code:\n"
-#~ "\n"
-#~ "%2$s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%1$s: Hãy xác nhận bạn là chủ nhân số điện thoại :\n"
-#~ "\n"
-#~ "%2$s\n"
-#~ "\n"
-
-#~ 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 ""
-#~ "%1$s (%2$s) đã gửi đến bạn tin nhắn riêng:\n"
-#~ "\n"
-#~ "------------------------------------------------------\n"
-#~ "%3$s\n"
-#~ "------------------------------------------------------\n"
-#~ "\n"
-#~ "Bạn có thể trả l�i tại:\n"
-#~ "\n"
-#~ "%4$s\n"
-#~ "\n"
-#~ "�ừng trả l�i lại thư này; sẽ không có ai nhận thư.\n"
-#~ "\n"
-#~ "Chúc sức kh�e,\n"
-#~ "%5$s\n"
-
-#~ msgid "Terms of use"
-#~ msgstr "TTSD"
-
-#~ msgid " Terms of use"
-#~ msgstr "Th�a thuận sử dụng"
-
-#~ msgid "Termsofuse"
-#~ msgstr "Th�a thuận sử dụng"
-
-#~ msgid "Click here to view emotion icon"
-#~ msgstr "Nhấn chuột vào đây để ch�n biểu tượng cảm xúc"
-
-#~ msgid "Import from Web Address Book"
-#~ msgstr "Nhập địa chỉ từ Yahoo hoặc Gmail"
-
-#~ msgid "Select All/None"
-#~ msgstr "Ch�n tất cả/Không ch�n"
-
-#~ msgid "Contacts not found."
-#~ msgstr "Không tìm thấy kết nối."
-
-#~ msgid ""
-#~ "Please input your yahoo or gmail account. List of contacts will be loaded "
-#~ "from your address book.\n"
-#~ "\n"
-#~ "Don't worry, we won't save your password and you'll get a chance to "
-#~ "choose which friends to invite."
-#~ msgstr ""
-#~ "Hãy nhập tài khoản yahoo hoặc tài khoản gmail của bạn. Danh sách bạn bè, "
-#~ "ngư�i thân sẽ được lấy từ sổ địa chỉ của bạn.\n"
-#~ "\n"
-#~ "�ừng lo, chúng tôi sẽ không lưu password của bạn và bạn sẽ có danh sách "
-#~ "những ngư�i bạn để m�i."
-
-#~ msgid "Import Address Book"
-#~ msgstr "Thêm vào danh sách địa chỉ"
-
-#~ msgid "Import Contacts Address Book from Yahoo, Gmail"
-#~ msgstr "Nhập sổ địa chỉ liên lạc từ Yahoo, Gmail"
-
-#~ msgid "Import Web Address Book from"
-#~ msgstr "Nhập sổ địa chỉ web từ"
-
-#~ msgid ""
-#~ "%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"
-#~ msgstr ""
-#~ "%2$s là một dịch vụ gửi tin nhắn mà nó cho phép bạn giữ liên lạc, cập "
-#~ "nhật thông tin với bạn bè, ngư�i thân và những ngư�i quan tâm đến bạn.\n"
-#~ "\n"
-#~ "Ban cũng có thể chia sẻ thông tin v� bản thân, những suy nghĩ, cuộc sống "
-#~ "của bạn với những ngư�i biết bạn. Là một công cụ hữu hiệu cho việc gặp gỡ "
-#~ "ngư�i mới, những ngư�i có cùng sở thích với bạn.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "%1$s has invited you to join them on %2$s (%3$s).\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 đã m�i bạn tham gia vào %2$s (%3$s).\n"
-#~ "\n"
-#~ "%1$s đã nói:\n"
-#~ "\n"
-#~ "%4$s\n"
-#~ "\n"
-#~ "Bạn có thể thấy trang hồ sơ của %1$s trên %2$s ở đây:\n"
-#~ "\n"
-#~ "%5$s\n"
-#~ "\n"
-#~ "Nếu bạn muốn thử dịch vụ này, hãy bấm vào đư�ng liên kết bên dưới để chấp "
-#~ "nhận l�i m�i.\n"
-#~ "\n"
-#~ "%6$s\n"
-#~ "\n"
-#~ "Nếu không, bạn có thể b� qua tin nhắn này. Cảm ơn sự kiên nhẫn và th�i "
-#~ "gian của bạn dành cho chúng tôi.\n"
-#~ "\n"
-#~ "Xin chân thành cảm ơn, %2$s\n"
-
-#~ msgid ""
-#~ "Hi, I recently created an account at %1$s and want to share it with you.\n"
-#~ "\n"
-#~ "%1$s is a free, micro-blogging service, which combines the best of blog "
-#~ "and chat. You can use it to write short notices (less than 140 "
-#~ "characters) about your daily life: where you are, what you are doing, and "
-#~ "how you are feeling.\n"
-#~ "\n"
-#~ "It is a tool that allows you to communicate, share, and stay in touch "
-#~ "with friends and to follow other people that interest you through the "
-#~ "exchange of short frequent messages (micro-blogging).\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Chào bạn, mình đã tạo tài khoản trên %1$s và muốn giới thiệu cho bạn cùng "
-#~ "biết v� dịch vụ này.\n"
-#~ "\n"
-#~ "%1$s là dịch vụ gửi tin nhắn ngắn miễn phí, một sự kết hợp tuyệt v�i giữa "
-#~ "blog và chat. Bạn có thể viết tin nhắn khoảng 140 kí tự v� đ�i sống "
-#~ "thư�ng nhật của bạn như: bạn ở đâu, bạn đang làm gì, và bạn cảm thấy thế "
-#~ "nào.\n"
-#~ "\n"
-#~ "�ây là công cụ để bạn giao tiếp, chia sẻ, kết nối với bạn bè và theo "
-#~ "những ngư�i có cùng sở thích với bạn bằng cách gửi cho nhau những tin "
-#~ "nhắn ngắn.\n"
-#~ "\n"
-
-#~ msgid "Copy and paste the embed code to your website or blog"
-#~ msgstr "Copy và dán mã trên vào website hay blog của bạn"
-
-#~ msgid ""
-#~ "Hey, %1$s\n"
-#~ "\n"
-#~ "Someone just asked for a new password for this account on %2$s.\n"
-#~ "\n"
-#~ "If it was you, and you want to confirm, use the URL below:\n"
-#~ "\n"
-#~ "\t%3$s\n"
-#~ "\n"
-#~ "If not, just ignore this message.\n"
-#~ "\n"
-#~ "Thanks for your time, \n"
-#~ "%1$s\n"
-#~ msgstr ""
-#~ "Xin chào, %1$s\n"
-#~ "\n"
-#~ "Không biết có phải bạn là ngư�i yêu cầu mật khẩu mới cho tài khoản này "
-#~ "trên %2$s.\n"
-#~ "\n"
-#~ "Nếu chính là bạn và nếu bạn muốn xác nhận, hãy nhấn chuột vào đư�ng dẫn "
-#~ "dưới đây:\n"
-#~ "\n"
-#~ "\t%3$s\n"
-#~ "\n"
-#~ "Nếu không phải bạn, hãy b� qua tin nhắn này.\n"
-#~ "\n"
-#~ "Cảm ơn bạn đã b� th�i gian để đ�c thư, \n"
-#~ "%1$s\n"
-
-#~ msgid ""
-#~ "You are about to permanently delete a message.  Once this is done, it "
-#~ "cannot be undone."
-#~ msgstr "Bạn muốn xóa tin nhắn này? Sau khi xóa, bạn không thể lấy lại được."
-
-#~ msgid "Can't delete this message."
-#~ msgstr "Không thể xóa tin nhắn này."
-
-#~ msgid "Timeline"
-#~ msgstr "Dòng tin"
-
-#~ msgid "Share a thought? Vas-y, ton tour..."
-#~ msgstr "Muốn chia sẽ ý nghĩ của bạn?"
-
-#~ msgid "Create date"
-#~ msgstr "Ngày thành lập"
-
-#~ msgid "Member count"
-#~ msgstr "Số thành viên"
-
-#~ msgid ""
-#~ "By clicking on 'I accept' above, you confirm that you are over 13 years "
-#~ "of age and accept the Terms of Service"
-#~ msgstr ""
-#~ "Nhấn vào 'Tôi đồng ý' ở trên để xác nhận là bạn trên 13 tuổi và chấp nhận "
-#~ "những đi�u khoản của dịch vụ"
-
-#~ msgid "I accept"
-#~ msgstr "Tôi đồng ý"
-
-#~ msgid "Group code invalid."
-#~ msgstr "Mã số của nhóm không đúng."
-
-#~ msgid "Register a Group"
-#~ msgstr "�ăng ký nhóm"
-
-#~ msgid "Only people who know this code can join the group. Required."
-#~ msgstr "Chỉ những ai biết mã này mới có thể gia nhập nhóm. Bắt buộc."
-
-#~ msgid "Enter the code if you want to join this group"
-#~ msgstr "Nhập vào mã của nhóm nếu bạn muốn tham gia."
-
-#~ msgid "Manage"
-#~ msgstr "Quản lý"
-
-#~ msgid "You have no authentication to access this page."
-#~ msgstr "Bạn không có quy�n truy cập trang này."
-
-#~ msgid "Check the flagged notice and then delete or ignore it."
-#~ msgstr ""
-#~ "Kiểm tra lại tin bị cảnh báo, sau đó bạn hãy quyết định xóa tin đó hoặc "
-#~ "xác nhận nó là hợp lệ."
-
-#~ msgid "Flagged"
-#~ msgstr "Kiểm tin"
-
-#~ msgid "Short description of the group"
-#~ msgstr "Mô tả ngắn g�n v� nhóm"
-
-#~ msgid "Check notice flagged by user"
-#~ msgstr "Kiểm tra các tin nhắn do ngư�i dùng cảnh báo"
-
-#~ msgid "is more fun with friends."
-#~ msgstr "vui hơn với bạn bè"
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. Nếu bạn chưa có tài "
+"khoản, [hãy đăng ký](%%action.register%%) tài khoản mới, hoặc thử đăng nhập "
+"bằng [OpenID](%%action.openidlogin%%). "
 
-#~ msgid "Hide recommendations"
-#~ msgstr "Tắt"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Dòng tin nhắn cho %s"
 
-#~ msgid ""
-#~ "Sorry, but you need to activate your account first. We sent the "
-#~ "activation email, so please check your email for details. Don't forget to "
-#~ "look in your spam folder as well."
-#~ msgstr ""
-#~ "Xin lỗi, bạn cần phải kích hoạt tài khoản của bạn trước. Chúng tôi đã gửi "
-#~ "email tới bạn, vì vậy hãy mở hộp mail để xem hướng dẫn chi tiết. �ừng "
-#~ "quên tìm cả trong spam."
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Các thay đổi phù hợp với từ \"%s\""
 
-#~ msgid "Chat vs T8M"
-#~ msgstr "Chat và T8M"
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Kết nối"
 
-#~ msgid "Prev"
-#~ msgstr "TrÆ°á»›c"
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#~ msgid "Next"
-#~ msgstr "Kế"
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#~ msgid "Group View"
-#~ msgstr "Xem theo nhóm"
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Nói v� bạn và những sở thích của bạn khoảng 140 ký tự"
 
-#~ msgid "Linear View"
-#~ msgstr "Xem tuần tự"
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Nói v� bạn và những sở thích của bạn khoảng 140 ký tự"
 
-#~ msgid "Channels"
-#~ msgstr "Kênh"
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Lý lịch quá dài (không quá 140 ký tự)"
 
-#~ msgid "Channel already exist. Try another one."
-#~ msgstr "Kênh này đã có rồi. Hãy ch�n tên khác."
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#~ msgid "Can't save this chanel"
-#~ msgstr "Lỗi khi lưu kênh"
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Không phải là URL v� hồ sơ cá nhân hợp lệ (không phải là "
 
-#~ msgid "You can create a new channel here."
-#~ msgstr "Bạn có thể tạo kênh tại đây."
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
 
-#~ msgid "Create Channel"
-#~ msgstr "Tạo Kênh"
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Không thể lấy token yêu cầu."
 
-#~ msgid "Channel name"
-#~ msgstr "Tên kênh"
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Dòng tin nhắn cho %s"
 
-#~ msgid "Name of channel. Required."
-#~ msgstr "Tên kênh. Bắt buộc"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Dòng tin nhắn cho %s"
 
-#~ msgid "Channel saved successfully"
-#~ msgstr "Tạo kênh thành công."
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Dòng tin nhắn cho %s"
 
-#~ msgid " You have just created channel %s successfuly."
-#~ msgstr "Bạn vừa tạo thành công kênh %s."
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "%s chào mừng bạn "
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Ch�n những ngư�i bạn của %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Ch�n những ngư�i bạn của %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Ch�n những ngư�i bạn của %s"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
 
-#~ msgid "Channel"
-#~ msgstr "Kênh"
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Hộp thư đi của %s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Tin đã gửi"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Trang này không phải là phương tiện truy�n thông mà bạn chấp nhận."
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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 ""
+"Vui lòng kiểm tra các chi tiết để chắc chắn rằng bạn muốn đăng nhận xem tin "
+"nhắn của các thành viên này. Nếu bạn không yêu cầu đăng nhận xem tin nhắn "
+"của h�, hãy nhấn \"Hủy b�\""
 
-#~ msgid "No such chanel."
-#~ msgstr "Không tìm thấy kênh nào."
+#: actions/userauthorization.php:249
+#, 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 ""
+"�ăng nhận được phép, nhưng URL trả lại không được gởi trả. Hãy kiểm tra các "
+"hướng dẫn chi tiết trên site để biết cách cho phép đăng ký. �ăng nhận token "
+"của bạn là:"
 
-#~ msgid "Channels View"
-#~ msgstr "Hệ thống các  kênh"
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"�ăng nhận này đã bị từ chối, nhưng không có URL nào để quay v�. Hãy kiểm tra "
+"các hướng dẫn chi tiết trên site để "
 
-#~ msgid "Create a channel"
-#~ msgstr "Tạo kênh"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#~ msgid "Register user by channel"
-#~ msgstr "�ăng ký theo kênh"
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#~ msgid "The channel this user in"
-#~ msgstr "Kênh mà bạn tham gia"
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
 
-#~ msgid " Subscribe"
-#~ msgstr "Theo kênh này"
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
 
-#~ msgid "Your incoming and sent messages"
-#~ msgstr "Hộp thư của bạn"
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
 
-#~ msgid "Send me all replies through Yahoo Messenger."
-#~ msgstr "Hãy gửi tin nhắn đến tôi qua Yahoo Messenger"
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Không thể đ�c URL cho hình đại diện '%s'"
 
-#~ msgid "Yahoo Messenger Settings"
-#~ msgstr "Thiết lập địa chỉ Yahoo"
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Kiểu file ảnh không phù hợp với  '%s'"
 
-#~ msgid ""
-#~ "You can send and receive notices through Yahoo Messenger [instant "
-#~ "messages](%%doc.im%%). Configure your yahoo address and settings below."
-#~ msgstr ""
-#~ "Bạn có thể gửi và nhận những tin nhắn qua Yahoo Messenger [tin nhắn nhanh]"
-#~ "(%%doc.im%%). Hãy định dạng địa chỉ của bạn và các thiết lập sau."
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Không thể chuyển đến máy chủ: %s"
 
-#~ msgid ""
-#~ "Awaiting confirmation on this address. Check your Yahoo inbox (and spam "
-#~ "box!) for a message with further instructions."
-#~ msgstr ""
-#~ "�ang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp thư đến(và thư rác) "
-#~ "để nhận tin nhắn và l�i hướng dẫn. "
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Tìm theo nội dung của tin nhắn"
 
-#~ msgid "Yahoo Address"
-#~ msgstr "�ịa chỉ email Yahoo"
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
 
-#~ msgid "Yahoo address, like \"UserName@yahoo.com\""
-#~ msgstr "�ịa chỉ email Yahoo, Ví dụ: \"UserName@yahoo.com\""
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
 
-#~ msgid "That is already your yahoo address."
-#~ msgstr "Bạn đã dùng địa chỉ email này rồi"
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Tin đã gửi"
 
-#~ msgid "Cannot normalize that Yahoo address"
-#~ msgstr "Không thể bình thư�ng hóa địa chỉ Yahoo này"
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
 
-#~ msgid "No yahoo address."
-#~ msgstr "Chưa nhập địa chỉ email Yahoo"
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
 
-#~ msgid ""
-#~ "A confirmation code was sent to the yahoo email address you added. Check "
-#~ "your inbox (and spam box!) for the code and instructions on how to use it."
-#~ msgstr ""
-#~ "Mã xác nhận đã được gửi đến địa chỉ email Yahoo của bạn. Hãy kiểm tra hộp "
-#~ "thư đến (và thư rác) và làm theo hướng dẫn trong thư."
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
 
-#~ msgid "says"
-#~ msgstr "nói"
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Trả l�i tin nhắn này"
 
-#~ msgid "Your message is posted successful."
-#~ msgstr "Tin nhắn đã gửi đi"
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
-#~ msgid "To use this service, You must register your YM with Saigonica."
-#~ msgstr "�ể được sử dụng dịch vụ này, bạn phải đăng ký YM trên Saigonica"
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Không có mã số xác nhận."
 
-#~ msgid "To use this service, You must register your Gtalk with Saigonica."
-#~ msgstr "�ể được sử dụng dịch vụ này, bạn phải đăng ký GTalk trên Saigonica"
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
 
-#~ msgid "GTalk Settings"
-#~ msgstr "Thiết lập địa chỉ GTalk"
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
 
-#~ msgid ""
-#~ "You can send and receive notices through Jabber/GTalk [instant messages](%"
-#~ "%doc.im%%). Configure your yahoo address and settings below."
-#~ msgstr ""
-#~ "Bạn có thể gửi và nhận những tin nhắn qua Jabber/GTalk [tin nhắn nhanh](%%"
-#~ "doc.im%%). Hãy định dạng địa chỉ của bạn và các thiết lập sau."
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
 
-#~ msgid ""
-#~ "Awaiting confirmation on this address. Check your GTalk inbox (and spam "
-#~ "box!) for a message with further instructions."
-#~ msgstr ""
-#~ "�ang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp thư đến(và thư rác) "
-#~ "để nhận tin nhắn và l�i hướng dẫn. "
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Ch�n nhà cung cấp Mobile"
 
-#~ msgid "GTalk Address"
-#~ msgstr "�ịa chỉ email GTalk"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Nói v� những sở thích của nhóm trong vòng 140 ký tự"
 
-#~ msgid ""
-#~ "A confirmation code was sent to the GTalk email address you added. Check "
-#~ "your inbox (and spam box!) for the code and instructions on how to use it."
-#~ msgstr ""
-#~ "Mã xác nhận đã được gửi đến địa chỉ email GTalk của bạn. Hãy kiểm tra hộp "
-#~ "thư đến (và thư rác) và làm theo hướng dẫn trong thư."
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Nói v� những sở thích của nhóm trong vòng 140 ký tự"
 
-#~ msgid "Check virus"
-#~ msgstr "Kiểm tra virus"
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "Thông báo mới"
 
-#~ msgid "Avatar "
-#~ msgstr "Hình"
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
 
-#~ msgid "Change your avatar"
-#~ msgstr "Thay đổi hình đại diện của bạn"
+#: lib/mail.php:556
+#, fuzzy, 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 ""
+"%1$s vừa thêm tin nhắn của bạn trên %2$s vào danh sách tin nhắn ưa thích của "
+"mình.\n"
+"\n"
+"Bạn có thể xem lại nội dung tin nhắn của bạn tại đây:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Bạn có thể xem danh sách tin nhắn ưa thích của %1$s tại đây: \n"
+"\n"
+"%4$s\n"
+"\n"
+"Chúc sức kh�e,\n"
+"%5$s\n"
 
-#~ msgid "Updates by Yahoo Messenger (YM)"
-#~ msgstr "Cập nhật địa chỉ Yahoo để gửi tin qua Yahoo Mesenger(YM)"
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
 
-#~ msgid "Ban from network"
-#~ msgstr "Ban user ra kh�i mạng"
+#: lib/mail.php:613
+#, 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"
+msgstr ""
 
-#~ msgid "Ban users violate rules of saigonica"
-#~ msgstr "Ban user vi phạm nội quy của saigonica"
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " từ "
 
-#~ msgid "Are you sure to ban this user?"
-#~ msgstr "Bạn có chắc muốn ban ngư�i này không?"
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
 
-#~ msgid "Your account was banned."
-#~ msgstr "Tài khoản của bạn đã bị ban."
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Không thể lấy lại các tin nhắn ưa thích"
 
-#~ msgid "User has been baned."
-#~ msgstr "User đã bị ban."
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Xóa tin nhắn"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
index 7984ab714..ce757eea5 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 5c2eced4e..05ab5243f 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,3 +1,6 @@
+# Translation of StatusNet to Simplified Chinese
+#
+# --
 # Messages of identi.ca
 # Copyright (C) 2008 Gouki <gouki@goukihq.org>
 # This file is distributed under the same license as the identi.ca package.
@@ -5,26 +8,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: identi.ca\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-07-28 14:03+0000\n"
-"Last-Translator: offacer <offacer@gmail.com>\n"
-"Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:51+0000\n"
+"Language-Team: Simplified Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: zh-hans\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "�索有关\"%s\"的消�"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr "除了��内容：密�，电�邮件，�时通讯��，电���。"
@@ -35,17 +39,19 @@ msgid " from "
 msgstr " 从 "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / 回� %2$s 的消�"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s 邀请您加入 %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -78,7 +84,8 @@ msgstr ""
 "%1$s 邀请你加入 %2$s (%3$s).\n"
 "\n"
 "%2$s 是一个能让你和你认识的�感兴趣的人���系的微�客�务。 \n"
-"你�以和你认识的人分享你的近况�想法或者你的网络生活。你也�以结交有共�兴趣的新朋�。\n"
+"你�以和你认识的人分享你的近况�想法或者你的网络生活。你也�以结交有共�兴趣"
+"的新朋�。\n"
 "\n"
 "%1$s 说:\n"
 "\n"
@@ -96,6 +103,7 @@ msgstr ""
 "诚挚的感谢, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s 开始关注您的 %2$s 信�。"
@@ -117,25 +125,28 @@ msgstr ""
 "为您效力的 %4$s\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "回� %2$s / %3$s 的 %1$s 更新。"
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s 的 %2$s 状�"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s 公开��"
@@ -145,40 +156,55 @@ msgstr "%s 公开��"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s �好�"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 公众时间表"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s 状�"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s 时间表"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "�自所有人的 %s 消��"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr "(您将收到一�邮件，包�了如何确认邮件地�的说明。)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -187,7 +213,8 @@ msgstr ""
 "**%%site.name%%** 是一个微�客�务，�供者为 [%%site.broughtby%%](%%site."
 "broughtbyurl%%)。"
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** 是一个微�客�务。"
@@ -199,30 +226,34 @@ msgstr "。贡献者应当有全�或昵称。"
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 到 64 个�写字�或数字，�包�标点�空白"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1 到 64 个�写字�或数字，�包�标点�空白。此项必填。"
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 个或更多字符"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 个或更多字符，�能忘记�"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 个或更多字符。此项必填。"
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -230,6 +261,7 @@ msgid ""
 msgstr "验��已被��到您新增的�时通讯��。您必须�许 %s �您��信�。"
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -263,7 +295,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API 方法未实现�"
 
@@ -286,16 +345,23 @@ msgstr "API 方法未实现�"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "API 方法尚未实现。"
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "关于"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "接�"
 
@@ -306,6 +372,9 @@ msgstr "接�"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "添加"
 
@@ -323,27 +392,29 @@ msgstr "添加或移除 OpenID"
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "地�"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "�邀请的好�地�(�行一个)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "所有订阅"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "所有 %s 消�"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "所有匹��索�件\"%s\"的消�"
@@ -353,30 +424,37 @@ msgstr "所有匹��索�件\"%s\"的消�"
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "已登录。"
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "已订阅�"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "确定�删除这�消��？"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "确认订阅"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "��这�机器上的登录状�。��在共用的机器上��登录�"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自动订阅任何订阅我的更新的人(这个选项最适�机器人)"
@@ -384,22 +462,29 @@ msgstr "自动订阅任何订阅我的更新的人(这个选项最适å�ˆæœºå™¨äº
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "头�"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "头�已更新。"
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, 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 "正在等待这个地�的确认。请查阅你Jabber/GTalk的�户看有没有收到进一步的指示。（你是�已�添加 %s为你的好�？）"
+msgstr ""
+"正在等待这个地�的确认。请查阅你Jabber/GTalk的�户看有没有收到进一步的指示。"
+"（你是�已�添加 %s为你的好�？）"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -408,7 +493,7 @@ msgstr ""
 "指示。"
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "等待确认此电���。"
 
@@ -420,6 +505,8 @@ msgstr "下一页 »"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "自述"
 
@@ -427,16 +514,18 @@ msgstr "自述"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "自述过长(�能超过140字符)。"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "无法删除通告。"
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "无法访问头�URL '%s'"
@@ -444,6 +533,8 @@ msgstr "无法访问头�URL '%s'"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "无法�存新密�。"
 
@@ -451,31 +542,34 @@ msgstr "无法�存新密�。"
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "�消"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "无法创建 OpenID 用户对象。"
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "无法识别此Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "无法识别此电�邮件"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "修改"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "修改电�邮件"
 
@@ -485,11 +579,12 @@ msgid "Change password"
 msgstr "修改密�"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "修改密�"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "修改您的个人信�"
 
@@ -499,6 +594,9 @@ msgstr "修改您的个人信�"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "确认"
 
@@ -511,12 +609,14 @@ msgstr "确认地�"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "已�消确认。"
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "确认�"
 
@@ -525,7 +625,8 @@ msgstr "确认�"
 msgid "Confirmation code not found."
 msgstr "未找到确认�。"
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -546,28 +647,35 @@ 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"
+"* 填加 [Jabber/GTalk address](%%%%action.imsettings%%%%) 然�你�以通过�时消"
+"�平��布信�。\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) 你认识的或和你有共�兴趣的"
+"朋�。 \n"
+"* 更新你的 [profile settings](%%%%action.profilesettings%%%%) 告诉大家更多关"
+"于你的情况。 \n"
 "* 请阅读 [online docs](%%%%doc.help%%%%) 有的功能也许你还�熟悉。\n"
 "\n"
 "感谢您的注册，希望您喜欢这个�务。"
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "连接"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "连接现有��"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "�系人"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "无法创建 OpenID 表�：%s"
@@ -575,35 +683,39 @@ msgstr "无法创建 OpenID 表�：%s"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "无法订阅用户：%s 已在订阅列表中。"
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "无法订阅用户：未找到。"
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "无法�定�到�务器：%s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "无法�存头�"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "无法�存个人信�"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "无法订阅他人更新。"
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "无法订阅。"
 
@@ -623,15 +735,17 @@ msgstr "无法将请求标记转�为访问令牌。"
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "无法删除电�邮件确认。"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "无法删除订阅。"
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "找�到任何信�。"
 
@@ -644,29 +758,38 @@ msgstr "无法获得一份请求标记。"
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "无法�入验��。"
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的订阅。"
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "无法�存个人信�。"
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr "无法更新用户的自动订阅选项。"
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "无法更新用户记录。"
 
@@ -682,42 +805,48 @@ msgstr "无法更新用户记录。"
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "无法更新用户。"
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "创建"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "创建使用此昵称的新用户。"
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "创建新��"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "为 OpenID 用户产生新的��。"
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "已确认的Jabber/GTalk��。"
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "已确认的�以��SMS短消�的电���。"
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "已确认的电�邮件。"
 
@@ -726,23 +855,27 @@ msgid "Currently"
 msgstr "目�"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "添加标签时数�库出错：%s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "添加回�时数�库出错：%s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "删除通告"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "用�超过140个字符�述您自己和您的爱好"
 
@@ -750,11 +883,13 @@ msgstr "用�超过140个字符�述您自己和您的爱好"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "电�邮件"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "电�邮件地�"
 
@@ -764,39 +899,43 @@ msgid "Email Settings"
 msgstr "电�邮件设置"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "电�邮件地�已存在。"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "电�邮件地�确认"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "电�邮件，类似 \"UserName@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "电�邮件地�"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "输入昵称或电�邮件。"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "输入手机收到的验��。"
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "无法认�令牌"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "无法将用户与 OpenID 连接。"
 
@@ -807,39 +946,46 @@ msgstr "无法连接用户。"
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "添加头�出错"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "添加个人信�出错"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "添加远程的个人信�出错"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "�存地�确认时出错。"
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "�存远程的个人信�时出错"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "�存个人信�时出错。"
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "�存用户时出错。"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "�存用户时出错；�正确。"
 
@@ -848,6 +994,9 @@ msgstr "�存用户时出错；�正确。"
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "�存用户设置时出错。"
 
@@ -858,6 +1007,7 @@ msgstr "更新个人信�时出错"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "更新远程的个人信�时出错"
 
@@ -867,33 +1017,36 @@ msgid "Error with confirmation code."
 msgstr "验��出错。"
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "昵称已被使用"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "常�问题FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "更新头�失败。"
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "%s 好�的��"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "%s 回�的��"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "%s 标签的��"
@@ -908,7 +1061,7 @@ msgstr "�索通告内容"
 msgid "Find people on this site"
 msgstr "�索用户信�"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -919,6 +1072,11 @@ msgstr "由于安全原因，修改设置�需�输入用户�和密�。"
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "全�"
 
@@ -927,23 +1085,33 @@ msgstr "全�"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "全�过长(�能超过 255 个字符)。"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "帮助"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "主页"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "主页"
 
@@ -951,21 +1119,27 @@ msgstr "主页"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL�正确。"
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "我希望通过邮件�布信�。"
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "�时通讯IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM ��"
 
@@ -975,19 +1149,19 @@ msgid "IM Settings"
 msgstr "IM 设置"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr "如果您已�拥有��，�以将它连接到您的 OpenID。请输入用户�和密�。"
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr "如果您希望添加新的 OpenID，输入它并点击“添加�。"
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -996,55 +1170,62 @@ msgstr "如果您忘记了密�，�以使用此邮箱收到新的密�。"
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "�布用的电�邮件"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "�布用的电�邮件被移除。"
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "旧密��正确"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "用户�或密��正确。"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "��密�的指示已被��到您的注册邮箱。"
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "头�URL '%s'�正确"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "电�邮件地� %s �正确"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "主页'%s'�正确"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "授�方�URL '%s'�正确"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "通告内容�正确"
 
@@ -1059,13 +1240,13 @@ msgid "Invalid notice url"
 msgstr "通告URL�正确"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "个人信�URL '%s'�正确。"
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "个人信�URL�正确(格�错误)"
 
@@ -1083,28 +1264,35 @@ msgstr "大��正确。"
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "用户�或密��正确。"
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "已��邀请"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "已��邀请给这些人："
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "邀请"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "邀请新用户"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1116,11 +1304,12 @@ msgstr ""
 "授�。"
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID 属于�一用户。"
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1130,12 +1319,14 @@ msgstr ""
 "或GTalk中将 %s 加为好�。"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "语言"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "语言过长(�能超过50个字符)。"
 
@@ -1144,7 +1335,15 @@ msgstr "语言过长(�能超过50个字符)。"
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "�置"
 
@@ -1153,7 +1352,12 @@ msgstr "�置"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "�置过长(�能超过255个字符)。"
 
@@ -1162,43 +1366,51 @@ msgstr "�置过长(�能超过255个字符)。"
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "登录"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "使用[OpenID](%%doc.openid%%)��登录。"
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
 "(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
 "%). "
 msgstr ""
-"请使用你的��和密�登入。没有��？[注册](%%action.register%%) 一个新��, 或使用 "
-"[OpenID](%%action.openidlogin%%). "
+"请使用你的��和密�登入。没有��？[注册](%%action.register%%) 一个新��, "
+"或使用 [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "登出"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "长�字，最好是“实��"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "忘记了密�？"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "生�新的电�邮件地�用于�布信�；�消旧的。"
 
@@ -1209,16 +1421,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "设置 %%site.name%% ��的邮件。"
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "用户始于"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "%s 的微�客�务"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1230,42 +1444,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr "我的文字和文件采用的授�方�为"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "新建"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "新的电�邮件地�，用于�布 %s 信�"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "已添加新的�布用的电�邮件地�。"
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "新昵称"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "新通告"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "新密�"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "新密�已�存，您现在已登录。"
 
@@ -1275,7 +1497,13 @@ msgstr "新密�已�存，您现在已登录。"
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "昵称"
 
@@ -1284,7 +1512,12 @@ msgstr "昵称"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，�一个�。"
 
@@ -1293,47 +1526,58 @@ msgstr "昵称已被使用，�一个�。"
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "昵称�能使用�写字�和数字，�包�空格。"
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "��许的昵称。"
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "希望订阅的用户的昵称"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "昵称或电�邮件"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "�"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "没有 Jabber ID。"
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "未收到认�请求�"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "未选择��商。"
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "没有输入验��"
 
@@ -1345,11 +1589,15 @@ msgstr "没有验��"
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "没有内容�"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "没有电�邮件地�。"
 
@@ -1358,7 +1606,9 @@ msgid "No id."
 msgstr "没有 id。"
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "没有�布用的电�邮件地�。"
 
@@ -1369,6 +1619,7 @@ msgstr "远程�务器没有昵称。"
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "没有昵称。"
 
@@ -1376,12 +1627,14 @@ msgstr "没有昵称。"
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "没有�以�消的确认。"
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "没有电���。"
 
@@ -1391,7 +1644,8 @@ msgid "No profile URL returned by server."
 msgstr "�务器没有返回个人信�URL。"
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "用户没有注册电�邮件。"
 
@@ -1403,7 +1657,7 @@ msgstr "没有找到请求�"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "没有结果"
 
@@ -1414,12 +1668,16 @@ msgstr "没有大�。"
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "没有找到此ID的信�。"
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "没有找到此ID的信�。"
 
@@ -1429,13 +1687,15 @@ msgid "No such OpenID."
 msgstr "没有这个 OpenID。"
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "没有这份文档。"
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "没有这份通告。"
 
@@ -1473,12 +1733,22 @@ msgstr "没有这个订阅"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "没有这个用户。"
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "没有拥有这个用户�或电�邮件的用户。"
 
@@ -1492,32 +1762,38 @@ msgid "Not a recovery code."
 msgstr "�是���。"
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr "�是已注册用户。"
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "�支�的数�格�。"
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "�是有效的 Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "�是有效的 OpenID。"
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "�是有效的电�邮件"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "�是有效的电�邮件。"
 
@@ -1525,6 +1801,11 @@ msgstr "�是有效的电�邮件。"
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "�是有效的昵称。"
 
@@ -1544,7 +1825,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "�是有效的个人信�URL(没有YADIS数�)。"
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "�是图片文件或文件已��。"
 
@@ -1555,11 +1837,13 @@ msgstr "未认�。"
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "未预料的�应�"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "未找到"
 
@@ -1575,11 +1859,15 @@ msgstr "未找到"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "未登录。"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "未订阅�"
 
@@ -1596,39 +1884,44 @@ msgid "Notice feed for %s"
 msgstr "%s 的通告��"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr "通告没有关�个人信�"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "通告"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "带 %s 标签的通告"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "旧密�"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "OpenID ��设置"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "OpenID 自动�交"
 
@@ -1636,29 +1929,34 @@ msgstr "OpenID 自动�交"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr "OpenID 登录"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr "OpenID 认�已�消。"
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID 认�失败：%s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID 失败：%s"
@@ -1674,11 +1972,12 @@ msgid "OpenID settings"
 msgstr "OpenID 设置"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "在邀请中加几��(�选)。"
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "部分上传。"
 
@@ -1688,34 +1987,46 @@ msgstr "部分上传。"
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "密�"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "密�和确认�匹�。"
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr "密�必须是 6 个字符或更多。"
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr "请求��密�"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr "密�已�存。"
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "密��匹�。"
 
@@ -1735,14 +2046,17 @@ msgid "People search"
 msgstr "�索用户"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "个人"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "个人消�"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "电���，�带标点或空格，包�地区代�"
 
@@ -1756,7 +2070,7 @@ msgstr ""
 "告，请点击\"�消\"。"
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "当我的Jabber/GTalk状�改�时自动�布通告。"
 
@@ -1765,7 +2079,9 @@ msgstr "当我的Jabber/GTalk状�改�时自动�布通告。"
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "首选项"
 
@@ -1774,42 +2090,52 @@ msgstr "首选项"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "首选项已�存。"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "首选语言"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "��"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "�存通告时出错。"
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "个人信�"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "个人信�URL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "个人设置"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "未知的��"
 
@@ -1818,17 +2144,19 @@ msgid "Public Stream Feed"
 msgstr "公开的��"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "公开的时间表"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "公开Jabber/GTalk��的 MicroID。"
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "公开电�邮件的 MicroID。"
 
@@ -1838,12 +2166,14 @@ msgid "Recent Tags"
 msgstr "最近的标签"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "��"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "��密�"
 
@@ -1856,37 +2186,45 @@ msgstr "���未知"
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "注册"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "��许注册。"
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "注册�功。"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "拒�"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "记�登录状�"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "没有匹�的远程个人信�"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "远程订阅"
 
@@ -1900,6 +2238,9 @@ msgstr "远程订阅"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "移除"
 
@@ -1908,41 +2249,48 @@ msgstr "移除"
 msgid "Remove OpenID"
 msgstr "移除OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr "移除唯一的OpenID�能使您无法登陆�如果需�移除它，请先添加一个新的。"
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr "回�"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "%s 的回�"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "�置"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "�置密�"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS短信"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "SMS短信电���"
 
@@ -1951,17 +2299,18 @@ msgstr "SMS短信电���"
 msgid "SMS Settings"
 msgstr "SMS短信设置"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "SMS短信确认"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "相�的密�"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "相�的密�。此项必填。"
 
@@ -1974,12 +2323,21 @@ msgstr "相�的密�。此项必填。"
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "�存"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "�索"
 
@@ -1989,7 +2347,7 @@ msgid "Search Stream Feed"
 msgstr "�索��"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1998,7 +2356,7 @@ msgstr ""
 "在 %%site.name%% 的通告内容中�索。�索�件至少包� 3 个字符，多个�索�件用"
 "空格分隔。"
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2008,48 +2366,56 @@ msgstr ""
 "� 3 个字符，多个�索�件用空格分隔。"
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr "选择��商"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr "��"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "�这个电�邮件�信以�布新的通告。"
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "如果有新订阅，通过电�邮件告诉我。"
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "通过Jabber/GTalk��通告。"
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr "通过SMS短信将通告�给我；我了解这样也许会给我带���的开支。"
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "如果我尚未订阅的用户回我消�，使用Jabber/GTalk通知我。"
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "设置"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "设置已�存。"
 
@@ -2069,27 +2435,32 @@ msgid "Something weird happened."
 msgstr "�生了奇怪的错误……"
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "对�起，�布用的电�邮件无法使用。"
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "对�起，这个�布用的电�邮件属于其他用户。"
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "��"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr "统计"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "未找到已有的OpenID。"
 
@@ -2097,24 +2468,28 @@ msgstr "未找到已有的OpenID。"
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr "订阅"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "订阅者"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "订阅已确认"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "订阅被拒�"
 
@@ -2122,28 +2497,35 @@ msgstr "订阅被拒�"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "订阅"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "上传文件时出错。"
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "标签"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "文本"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "�索文本"
 
@@ -2163,6 +2545,7 @@ msgid "That confirmation code is not for you!"
 msgstr "此确认��适用�"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "此电�邮件属于其他用户。"
 
@@ -2172,63 +2555,73 @@ msgid "That file is too big."
 msgstr "文件超出大��制。"
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "您已登记此Jabber��。"
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "您已登记此电�邮件。"
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "您已登记此电���。"
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "这�是您的Jabber��。"
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "这是他人的电�邮件。"
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr "这是他人的电���。"
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "�时通讯��错误。"
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "确认�错误。"
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr "这个电���属于�一个用户。"
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "超出长度�制。�能超过 140 个字符。"
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "超出长度�制。�能超过 255 个字符。"
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "地� \"%s\" 已确认。"
@@ -2237,11 +2630,14 @@ msgstr "地� \"%s\" 已确认。"
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "地�被移除。"
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2249,7 +2645,8 @@ msgid ""
 msgstr ""
 "订阅已确认，但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是："
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2257,40 +2654,45 @@ msgid ""
 msgstr "订阅已被拒�，但是没有回传URL。请到此网站查看如何拒�订阅。"
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "这些用户订阅了 %s 的通告。"
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "这些用户订阅了您的通告。"
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "这是 %s 订阅的用户。"
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "这是您订阅的用户。"
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr "这些好�已注册，您已自动订阅这些用户。"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "验��超时，请��。"
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr "此表�会自动�交。如果没有，点击“�交�以转� OpenID �供者。"
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2304,6 +2706,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "此方法接�POST或DELETE请求。"
 
@@ -2312,47 +2717,63 @@ msgstr "此方法接�POST或DELETE请求。"
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "此方法接�POST请求。"
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "这个页���供您想�的媒体类型"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "时区"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "未选择时区。"
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: 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 ""
-"�订阅，你�以登录 (%%action.login%%), 或注册(%%action.register%%) "
-"一个新��。如果你已�有在�一个兼容的微�客的��(%%doc.openmublog%%),  请填入你资料的互�网地�URL."
+"�订阅，你�以登录 (%%action.login%%), 或注册(%%action.register%%) 一个新�"
+"�。如果你已�有在�一个兼容的微�客的��(%%doc.openmublog%%),  请填入你资料"
+"的互�网地�URL."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr "必须�供两个用户��或昵称。"
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "您的主页��客或在其他站点的URL"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "您在其他兼容的微�客�务的个人信�URL"
 
@@ -2364,15 +2785,22 @@ msgstr "您在其他兼容的微�客�务的个人信�URL"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "未预料的表��交。"
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "未预料的密��置。"
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "未知动作"
 
@@ -2401,38 +2829,47 @@ msgstr "退订"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "�支�此OMB版本"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "�支�这�图�格�。"
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "使用SMS短信更新"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "使用�时通讯工具(IM)更新"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s 上 %1$s 和好�的更新�"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新�"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "上传"
 
@@ -2451,12 +2888,15 @@ msgid "Upload a new profile image"
 msgstr "上传个人信�头�"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "使用这个表��邀请好�和�事加入。"
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "�用于更新�通告或密���"
 
@@ -2480,11 +2920,16 @@ msgstr "�查看的用户�存在。"
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "用户没有个人信�。"
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "昵称"
 
@@ -2493,29 +2938,33 @@ msgid "User not found."
 msgstr "未找到用户。"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "您一般处于哪个时区？"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr "怎么样，%s？"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的�置，格�类似\"城市，�份，国家\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "'%s' 图�格�错误"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "图�大� '%s' 错误"
@@ -2523,7 +2972,9 @@ msgstr "图�大� '%s' 错误"
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "是"
 
@@ -2544,11 +2995,12 @@ msgid "You are already logged in!"
 msgstr "已登录�"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "您已订阅这些用户："
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "您与此用户并�好�。"
 
@@ -2566,13 +3018,14 @@ msgstr "请创建新��，开始�布通告。"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "您�以通过 %%site.name%% 的电�邮件接收SMS短信。"
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "您�以点击\"移除\"按钮，移除��的 OpenID。"
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2581,7 +3034,8 @@ msgstr ""
 "您�以通过Jabber/GTalk [�时通讯工具](%%doc.im%%)��和接�通告。在这里�置它"
 "们。"
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "在这里更新个人信�，让大家对您了解得更多。"
@@ -2590,21 +3044,23 @@ msgstr "在这里更新个人信�，让大家对您了解得更多。"
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "您�以在这里订阅�"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "您必须��此授�方�注册。"
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "您未告知此个人信�"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2625,35 +3081,39 @@ msgstr ""
 "为您效力的 %4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "您�能删除其他用户的状�。"
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr "您必须登录�能邀请其他人使用 %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 "如果其他人接�邀请并注册，您将得到通知。谢谢您推动了社区�展壮大�"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "您已得到确认。请输入新密�。"
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "您的OpenID URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "您在此�务器的昵称，或注册邮箱。"
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2662,47 +3122,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%)�许您使用相�的��登录许多��的站点。在这里管�已"
 "关�的 OpenID。"
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "几秒�"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "%d 天�"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d �时�"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d 分钟�"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "%d 个月�"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "一天�"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "一分钟�"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "一个月�"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "一年�"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "一�时�"
 
@@ -2724,12 +3194,14 @@ msgid "reply"
 msgstr "回�"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "相�的密�"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "�支�这�类型的文件"
 
@@ -2751,6 +3223,26 @@ msgstr "« 之�"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "会�标识有问题，请�试。"
 
@@ -2759,6 +3251,7 @@ msgid "This notice is not a favorite!"
 msgstr "此通告未被收��"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "无法删除收�。"
 
@@ -2766,22 +3259,28 @@ msgstr "无法删除收�。"
 msgid "Favor"
 msgstr "收�"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "如果有人收�我的通告，�邮件通知我。"
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "如果收到�人信�，�邮件通知我。"
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "已收�此通告�"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "无法创建收�。"
 
@@ -2791,11 +3290,13 @@ msgstr "�消收�"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s 收�的通告"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "%s 的收�的��"
@@ -2837,33 +3338,44 @@ msgid "Login with your username and password. "
 msgstr "输入用户�和密�以登录。"
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "超出长度�制。�能超过 140 个字符。"
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "没有收件人。"
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "无法�此用户��消�。"
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "���自己��消�；跟自己悄悄说就得了。"
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "未找到用户"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "新消�"
 
@@ -2917,6 +3429,11 @@ msgstr "您�以在这里更新个人信�。"
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "找�到匹�的用户。"
 
@@ -2945,6 +3462,8 @@ msgid "New password successfully saved. "
 msgstr "新密�已�存。"
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "密�必须包� 6 个或更多字符。"
 
@@ -2965,12 +3484,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "�订阅，请先[登录](%%action.login%%)，"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr "%s 的收�的��"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "无法获�收�的通告。"
 
@@ -2978,7 +3500,7 @@ msgstr "无法获�收�的通告。"
 msgid "No such message."
 msgstr "未找到此消�。"
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "�有��和接��方�以阅读此消�。"
 
@@ -3002,51 +3524,70 @@ msgid "Mobile carrier for your phone. "
 msgstr "手机的��商。"
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "�给 %s 的直接消�"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "�给 %s 的直接消�"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "您已��的直接消�"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s ��的直接消�"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "消�没有正文�"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "未找到收件人。"
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "无法�并�好�的用户��直接消�。"
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s 的收� / %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s 收�了 %s 的 %s 通告。"
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s 收�了您的通告"
@@ -3067,14 +3608,17 @@ msgid ""
 msgstr "添加 Twitter ��，自动� Twitter ��更新。"
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Twitter 设置"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Twitter ��"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "已验�的 Twitter ��。"
 
@@ -3083,6 +3627,7 @@ msgid "Twitter Username"
 msgstr "Twitter 用户�"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "请��包�空格。"
 
@@ -3091,24 +3636,29 @@ msgid "Twitter Password"
 msgstr "Twitter 密�"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "自动将我的通告转�到 Twitter。"
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "将这里的 \"@\" 回���到 Twitter。"
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "在这里订阅 Twitter 好�。"
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr "用户��能包�数字，大写和�写字�和下划线。�能超过 15 个字符。"
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "�能验� Twitter ���"
 
@@ -3119,33 +3669,43 @@ msgstr "无法从 Twitter 获�\"%s\"的��信�。"
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "无法�存 Twitter 设置�"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Twitter 设置已�存。"
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "此 Twitter ��属于他人。"
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "无法移除 Twitter 用户。"
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Twitter ��已移除。"
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "无法�存 Twitter 首选项。"
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Twitter 首选项已�存。"
 
@@ -3162,18 +3722,19 @@ msgid "The subscription has been rejected, but no "
 msgstr "订阅已拒�，但是"
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "执行结果"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "执行完毕"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "执行失败"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "对�起，这个命令还没有实现。"
 
@@ -3183,89 +3744,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "订阅：%1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "用户没有通告。"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "通告被标记为收�。"
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "全�：%s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "�置：%s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "关于：%s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "您的消�包� %d 个字符，超出长度�制 - �能超过 140 个字符。"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "已� %s ��消�"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "��消�出错。"
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "指定�订阅的用户�"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "订阅 %s"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "指定��消订阅的用户�"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "�消订阅 %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "通告关闭。"
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "无法关闭通告。"
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "通告开�。"
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "无法开�通告。"
 
@@ -3273,11 +3856,11 @@ msgstr "无法开�通告。"
 msgid "Commands:\n"
 msgstr "命令：\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "无法添加信�。"
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "无法添加新URI的信�。"
 
@@ -3294,7 +3877,7 @@ msgstr ""
 "您的新的�布用的地�是 %1$s。\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "%s ��了新的�人信�"
@@ -3308,7 +3891,7 @@ msgstr ""
 "%1$s (%2$s) ��了新的�人信�：\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "�有用户自己�以访问邮箱。"
 
@@ -3317,31 +3900,39 @@ msgid "This form should automatically submit itself. "
 msgstr "此表�会自动�交。"
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "收�夹"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s 收�的通告"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "用户"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "收件箱"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "您接收的消�"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "�件箱"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "您��的消�"
 
@@ -3354,14 +3945,19 @@ msgid "Twitter integration options"
 msgstr "Twitter 整�选项"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "到"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "无法解�消�。"
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s �好�"
@@ -3371,21 +3967,31 @@ msgid "You can upload your personal avatar."
 msgstr "您�以在这里上传个人头�。"
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "头�设置"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "原�的"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "预览"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "剪�"
 
@@ -3403,37 +4009,46 @@ msgid "There was a problem with your session token. "
 msgstr "会�标识有问题，请�试。"
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "请选择一�方形区域作为你的头�"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "文件数�丢失"
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "没有这份通告。"
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "未知文件类型"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 #, fuzzy
 msgid "No profile specified."
 msgstr "没有收件人。"
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 #, fuzzy
 msgid "No profile with that ID."
 msgstr "没有找到此ID的信�。"
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "阻止用户"
@@ -3443,11 +4058,11 @@ msgstr "阻止用户"
 msgid "Are you sure you want to block this user? "
 msgstr "确定�阻止该用户�？"
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "您已�功阻止该用户："
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "�存阻止信�失败。"
 
@@ -3465,41 +4080,58 @@ msgstr "您将�永久删除这�通告。"
 msgid "Add to favorites"
 msgstr "加入收�"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "编辑 %s 组"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 #, fuzzy
 msgid "Inboxes must be enabled for groups to work"
 msgstr "使用组功能�必须使能邮箱"
 
-# before login, the user don't even see any Chinese translation. Anyway. This may be good for the future.
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "您必须登录�能创建�组。"
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "没有昵称。"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "没有这个组"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "�有admin�能编辑这个组"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "使用这个表��编辑组"
 
@@ -3509,14 +4141,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr "昵称�能使用�写字�"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "�述过长(�能超过140字符)。"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "无法更新组"
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "选项已�存。"
 
@@ -3535,7 +4168,8 @@ msgstr "新的电�邮件地�，用于�布 %s 信�"
 msgid "Send me email when someone "
 msgstr "如果收到�人信�，�邮件通知我。"
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "�许朋�们呼�并给我��邮件。"
 
@@ -3549,7 +4183,7 @@ msgstr "此电�邮件属于其他用户。"
 msgid "A confirmation code was sent to the email address you added. "
 msgstr "验��已被��到您新增的�时通讯��。您必须�许 %s �您��信�。"
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "�务器报错 -- 无法找到该用户。"
 
@@ -3563,55 +4197,70 @@ msgstr "如果你想使用 %s 程�自动更新"
 msgid "Allow %s to update my Facebook status"
 msgstr "�许 %s 更新我Facebook 的状�"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "跳过"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "没有内容�"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "分页"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 #, fuzzy
 msgid "After"
 msgstr "« 之�"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "之� »"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "感谢您邀请朋�使用 %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 #, fuzzy
 msgid "Invitations have been sent to the following users:"
 msgstr "已��邀请给这些人："
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, fuzzy, php-format
 msgid "You have been invited to %s"
 msgstr "您已被邀请到 %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "%s 好�的��"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "已�正在使用 %s 的朋�："
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "�出邀请"
@@ -3658,13 +4307,15 @@ msgstr "如果你希望 %s 自动更新。"
 msgid "Sync preferences"
 msgstr "�步设置"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 #, fuzzy
 msgid "Disfavor favorite"
 msgstr "�消收�"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "没有这份通告。"
@@ -3680,7 +4331,8 @@ msgid "The most popular notices on the site right now."
 msgstr "显示上周以�最�行的标签"
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "推�用户"
 
@@ -3694,15 +4346,17 @@ msgstr "推�用户，第 %d 页"
 msgid "A selection of some of the great users on %s"
 msgstr "%s 优秀用户摘选"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "那个用户阻止了你的订阅。"
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "没有ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "组logo"
 
@@ -3710,11 +4364,13 @@ msgstr "组logo"
 msgid "You can upload a logo image for your group."
 msgstr "你�以给你的组上载一个logo图。"
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "logo已更新。"
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "更新logo失败。"
@@ -3734,7 +4390,8 @@ msgid "A list of the users in this group."
 msgstr "该组�员列表。"
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "组"
 
@@ -3744,12 +4401,12 @@ msgid "Groups, page %d"
 msgstr "组，第 %d 页"
 
 #: actions/groups.php:90
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "%%%%site.name%%%% 组你�以查找并�络"
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "创建新组"
@@ -3760,7 +4417,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr "在 %%site.name%% 的用户信�中�索，�以�索姓��未知和爱好。"
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "组检索"
 
@@ -3784,21 +4441,21 @@ msgstr "通过Jabber/GTalk��通告。"
 msgid "A confirmation code was sent "
 msgstr "确认消�已���"
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 #, fuzzy
 msgid "You must be logged in to join a group."
 msgstr "您必须登录�能加入组。"
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "您已�是该组�员"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "无法把 %s 用户添加到 %s 组"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, fuzzy, php-format
 msgid "%s joined group %s"
 msgstr "%s 加入 %s 组"
@@ -3807,16 +4464,19 @@ msgstr "%s 加入 %s 组"
 msgid "Inboxes must be enabled for groups to work."
 msgstr "邮箱必须使能组�能工作。"
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 #, fuzzy
 msgid "You must be logged in to leave a group."
 msgstr "您必须登录�能邀请其他人使用 %s"
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "没有这个组。"
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "您未告知此个人信�"
@@ -3826,22 +4486,26 @@ msgstr "您未告知此个人信�"
 msgid "You may not leave a group while you are its administrator."
 msgstr "您�能删除其他用户的状�。"
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 #, fuzzy
 msgid "Could not find membership record."
 msgstr "无法更新用户记录。"
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "无法订阅用户：未找到。"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s 离开群 %s"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "登录"
 
@@ -3853,15 +4517,17 @@ msgstr "没有当�状�"
 msgid "New group"
 msgstr "新组"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "使用此表格创建组。"
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "无法创建组。"
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "无法删除订阅。"
@@ -3876,11 +4542,14 @@ msgstr "文件超出大��制。"
 msgid "Don't send a message to yourself; "
 msgstr "无法�此用户��消�。"
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "消�已�布。"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Ajax错误"
 
@@ -3897,7 +4566,7 @@ msgstr "振铃呼��出。"
 msgid "Nudge sent!"
 msgstr "振铃呼�已��出�"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "OpenID 登录"
@@ -3924,11 +4593,13 @@ msgstr "URL自动缩短"
 msgid "Service"
 msgstr "�务"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "�使用的自动缩短�务。"
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL缩短�务超长(最多50个字符)。"
@@ -3938,17 +4609,18 @@ msgstr "URL缩短�务超长(最多50个字符)。"
 msgid "Change your password."
 msgstr "修改密�"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "密�已�存。"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "�是有效的电�邮件"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "用户自加标签 %s - 第 %d 页"
@@ -3958,12 +4630,13 @@ msgstr "用户自加标签 %s - 第 %d 页"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "这些是自我标识为 \"%s\"  的用户"
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "未知的��"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "你的标签 (字�letters, 数字numbers, -, ., 和 _), 以逗�或空格分隔"
@@ -3974,21 +4647,26 @@ msgid "Automatically subscribe to whoever "
 msgstr "自动订阅任何订阅我的更新的人(这个选项最适�机器人)"
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "主页'%s'�正确"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "无法�存个人信�。"
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "公开的时间表"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "无法获�收�的通告。"
@@ -3999,8 +4677,8 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"这里是 %%site.name%%,一个微�客 [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) �务"
+"这里是 %%site.name%%,一个微�客 [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) �务"
 
 #: actions/publictagcloud.php:57
 #, fuzzy
@@ -4012,11 +4690,13 @@ msgstr "公开的��"
 msgid "These are most popular recent tags on %s "
 msgstr "这些是最近的 %s �行标签 "
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "标签云�集"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "对�起，请邀请那些能注册的人。"
 
@@ -4073,7 +4753,8 @@ msgstr "(您将立�收到一�电�邮件，�有"
 msgid "That's a local profile! Login to subscribe."
 msgstr "那是一个本地资料�需�登录�能订阅。"
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "%s 的回�，第 % 页"
@@ -4083,53 +4764,74 @@ msgstr "%s 的回�，第 % 页"
 msgid "%s favorite notices, page %d"
 msgstr "%s 收�的通告"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s 组"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s 组, 第 %d 页"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "组资料"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL 互�网地�"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "通告"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "组动作"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "%s 的通告��"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "注册于"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "（没有）"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "所有�员"
 
@@ -4139,15 +4841,15 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微�客�务 [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging)"
+"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微�客�务 [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/showmessage.php:98
 #, fuzzy
 msgid "Only the sender and recipient "
 msgstr "�有��和接��方�以阅读此消�。"
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "%s 的收件箱 - 第 %d 页"
@@ -4158,35 +4860,42 @@ msgid "'s profile"
 msgstr "个人信�"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "用户没有个人信�。"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "相片"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 #, fuzzy
 msgid "User actions"
 msgstr "未知动作"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 #, fuzzy
 msgid "Send a direct message to this user"
 msgstr "无法�此用户��消�。"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 #, fuzzy
 msgid "Message"
 msgstr "新消�"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "订阅者"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "所有组"
 
@@ -4196,8 +4905,8 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** 有一个��在 %%%%site.name%%%%, 一个微�客�务 [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging)"
+"**%s** 有一个��在 %%%%site.name%%%%, 一个微�客�务 [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/smssettings.php:128
 #, fuzzy
@@ -4214,7 +4923,7 @@ msgstr "通过Jabber/GTalk��通告。"
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "等待确认此电���。"
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "选择��商"
@@ -4279,17 +4988,18 @@ msgstr "这是 %s 订阅的用户。"
 msgid "These are the people whose "
 msgstr "这些用户订阅了 %s 的通告。"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "没有 Jabber ID。"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "带 %s 标签的通告"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "有 \"%s\" 标签的消�，最近的排�在�"
@@ -4314,28 +5024,29 @@ msgstr "标签"
 msgid "Tag user"
 msgstr "标签"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
-msgstr "给这个用户加注标签 (字�letters, 数字numbers, -, ., and _), 逗�或空格分隔"
+msgstr ""
+"给这个用户加注标签 (字�letters, 数字numbers, -, ., and _), 逗�或空格分隔"
 
 #: actions/tagother.php:164
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "会�标识有问题，请�试。"
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "你�能给你订阅的人或订阅你的人加标签。"
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "无法�存头�"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "使用这个表格给你的关注者或你的订阅加注标签。"
 
@@ -4344,20 +5055,23 @@ msgstr "使用这个表格给你的关注者或你的订阅加注标签。"
 msgid "No such tag."
 msgstr "未找到此消�。"
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "带 %s 标签的通告"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "阻止用户失败。"
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "�消阻止用户失败。"
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "未找到"
@@ -4367,17 +5081,18 @@ msgstr "未找到"
 msgid "Add your Twitter account to automatically send "
 msgstr "添加 Twitter ��，自动� Twitter ��更新。"
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 #, fuzzy
 msgid "Twitter user name"
 msgstr "Twitter 用户�"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 #, fuzzy
 msgid "Twitter password"
 msgstr "Twitter 密�"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 #, fuzzy
 msgid "Twitter Friends"
 msgstr "Twitter 设置"
@@ -4391,156 +5106,165 @@ msgstr "用户��能有数字，"
 msgid "Unable to retrieve account information "
 msgstr "无法从 Twitter 获�\"%s\"的��信�。"
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "�存用户时出错。"
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "�务器没有返回个人信�URL。"
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 #, fuzzy
 msgid "No profile with that id."
 msgstr "没有找到此ID的信�。"
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "退订"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "%s 群组"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s 群组, 第 %d 页"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "�存通告时出错。"
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr "你在短时间里�布了过多的消�，请深呼�，过几分钟��消�。"
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "在这个网站你被�止�布消�。"
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "上载一个头�。"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "其他"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "其他选项"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "无标题页"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "主站导航"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "个人资料�朋�年表"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "检索人或文字"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "��"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "修改资料"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "与IM，手机短信，Twitter的连接"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "登出本站"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "登入本站"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "创建新��"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "没有这个 OpenID。"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "帮助"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "新通告"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "本地显示"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "新通告"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "次项站导航"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "StatusNet软件注册�"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "全部"
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "注册�"
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "阻止该用户"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "阻止"
 
@@ -4554,12 +5278,15 @@ msgstr "%s 收�的通告"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "你需�登录方能使用%sFacebook程�"
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "一个新��"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "已�布"
 
@@ -4581,35 +5308,40 @@ msgstr "%s 标签的��"
 msgid "All"
 msgstr "全部"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 #, fuzzy
 msgid "Tag"
 msgstr "标签"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "选择标签缩�清�"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "执行"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "您的主页��客或在其他站点的URL"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
 msgstr "�述"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "用�超过140个字符�述您自己和您的爱好"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4619,21 +5351,21 @@ msgstr "你的�置，格�类似\"城市，�份，国家\""
 msgid "Group"
 msgstr "组"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "admin管�员"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "编辑 %s群选项"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 #, fuzzy
 msgid "Logo"
 msgstr "Logo图标"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "添加或编辑 %s 图标"
@@ -4666,12 +5398,12 @@ msgstr "加入"
 msgid "Leave"
 msgstr "�存"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "输入用户�和密�以登录。"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "创建新��"
@@ -4694,17 +5426,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s 开始关注您的 %2$s 信�。"
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "�置：%s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "主页：%s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4713,7 +5445,7 @@ msgstr ""
 "自传Bio: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s 振铃呼�你"
@@ -4728,47 +5460,55 @@ msgstr "%1$s (%2$s) ��了新的�人信�："
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s 收�了您的 %2$s 通告"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 #, fuzzy
 msgid "From"
 msgstr "从 "
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "删除通告"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "��消�"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 个或更多字符"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 #, fuzzy
 msgid "in reply to"
 msgstr "先�……"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "无法删除通告。"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "回�"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete this notice"
 msgstr "删除通告"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete"
 msgstr "删除"
@@ -4791,28 +5531,30 @@ msgstr "呼�这个用户"
 msgid "Tags in %s's notices"
 msgstr "%s's 的消�的标签"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(none 没有)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "公告"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "用户组"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 #, fuzzy
 msgid "Recent tags"
 msgstr "最近的标签"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "特�"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "用户"
@@ -4831,32 +5573,34 @@ msgstr "�索用户信�"
 msgid "Untitled section"
 msgstr "无标题章节"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "%s 订阅的人"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "订阅 %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s 组是�员组�了"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "使用这个表��邀请好�和�事加入。"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "用户没有个人信�。"
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "订阅 %s"
@@ -4872,11 +5616,12 @@ msgid "Top posters"
 msgstr "�水精英"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 #, fuzzy
 msgid "Unblock this user"
 msgstr "�消阻止次用户"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "�消阻止"
 
@@ -4885,22 +5630,2041 @@ msgstr "�消阻止"
 msgid "Unsubscribe from this user"
 msgstr "�消订阅 %s"
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s 好�的��"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s 好�的��"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s 好�的��"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s �好�"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "您�以在这里上传个人头�。"
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "头�已更新。"
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 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:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "会�标识有问题，请�试。"
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "如果收到�人信�，�邮件通知我。"
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "你�以给你的组上载一个logo图。"
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "请选择一�方形区域作为你的头�"
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "%s 的微�客�务"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, 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 ""
+"在 %%site.name%% 的用户信�中�索，�以�索姓��未知和爱好。�索�件至少包"
+"� 3 个字符，多个�索�件用空格分隔。"
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "��消�出错。"
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "�索有关\"%s\"的消�"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr "由于安全原因，修改设置�需�输入用户�和密�。"
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "公开的��"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "公开的��"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "公开的��"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "除了��内容：密�，电�邮件，�时通讯��，电���。"
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "创建"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
 #, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "命令尚未实现。"
+msgid "Your profile"
+msgstr "组资料"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "个人信�"
 
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s 的通告��"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s 的通告��"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s 的通告��"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "%s 的�件箱"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "创建新��"
+msgid "Edit Avatar"
+msgstr "头�"
 
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
 #, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "无法删除电�邮件确认。"
+msgid "Edit profile settings"
+msgstr "个人设置"
 
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "确定�删除这�通告�？"
+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 ""
+"验��已被��到您新增的电���。请检查收件箱(和垃圾箱)，找到验��并按�求"
+"使用它。"
 
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "未找到用户"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr "添加 Twitter ��，自动� Twitter ��更新。"
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "无法从 Twitter 获�\"%s\"的��信�。"
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+#, 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/usergroups.php:131 actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "检索人或文字"
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr "你在短时间里�布了过多的消�，请深呼�，过几分钟��消�。"
+
+#: lib/action.php:406 lib/action.php:425
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "�索通告内容"
+msgid "Connect to SMS, Twitter"
+msgstr "与IM，手机短信，Twitter的连接"
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "呼�"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "你需�登录方能使用%sFacebook程�"
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"%1$s 开始关注您的 %2$s 信�。\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"为您效力的 %4$s\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "�索"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "没有这份文档。"
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "该组�员列表。"
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "该组�员列表。"
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "用户没有个人信�。"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s �好�"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "该组�员列表。"
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "�消阻止用户失败。"
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "确认�"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "无法删除通告。"
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "主页'%s'�正确"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "昵称已被使用，�一个�。"
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "无法创建收�。"
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "新通告"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "新通告"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "�是有效的昵称。"
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "没有收件人。"
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "用户没有个人信�。"
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "您未告知此个人信�"
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "阻止用户"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "您必须登录�能创建�组。"
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "组"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "无法更新用户。"
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "无法�存 Twitter 设置�"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "�步选项已�存。"
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "�有admin�能编辑这个组"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "admin管�员"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "没有结果"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "用户没有个人信�。"
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "新消�"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "无法�存个人信�。"
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%)�许您使用相�的��登录许多��的站点。在这里管�已"
+"关�的 OpenID。"
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "个人设置"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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."
+msgstr ""
+"这里是 %%site.name%%,一个微�客 [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) �务"
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've 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
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "您已得到确认。请输入新密�。"
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "请求��密�"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "验��出错。"
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "订阅 %s"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s 收�的通告"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%s 的通告��"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "%s 的通告��"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "%s 的通告��"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微�客�务 [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "admin管�员"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "没有这个用户。"
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "带 %s 标签的通告"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%s 的通告��"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+"**%s** 有一个��在 %%%%site.name%%%%, 一个微�客�务 [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s 开始关注您的 %2$s 信�。"
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s 的通告��"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s 的通告��"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "已收�此通告�"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "此通告未被收��"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "无法获�收�的通告。"
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "没有收件人。"
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "找�到任何信�。"
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / 回� %2$s 的消�"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新�"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "注册�"
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "所有订阅"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "个人设置"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "您未告知此个人信�"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "�存通告时出错。"
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "��给 %1$s 的 %2$s 消�"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "用户没有个人信�。"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "个人信�"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "上传"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "修改密�"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "连接"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "�索"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "登录"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "阻止"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "阻止用户"
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "添加或编辑 %s 图标"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "没有内容�"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "用户"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "�索"
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "主页的URL�正确。"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "未找到此消�。"
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "�给 %s 的直接消�"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "超出长度�制。�能超过 140 个字符。"
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "无法订阅用户：未找到。"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "�述过长(�能超过140字符)。"
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "您已�是该组�员"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "无法把 %s 用户添加到 %s 组"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "您未告知此个人信�"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "无法订阅用户：未找到。"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s 群组"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s 组是�员组�了"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "组动作"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "头�已更新。"
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "超出长度�制。�能超过 140 个字符。"
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "�支�这�图�格�。"
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "相片"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "�述过长(�能超过140字符)。"
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新�"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "�查看的用户�存在。"
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "未认�。"
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "无法将请求标记转�为访问令牌。"
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "此OMB�议版本无效。"
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "没有这份通告。"
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "没有这份通告。"
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新�"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "这个页���供您想�的媒体类型"
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"请使用你的��和密�登入。没有��？[注册](%%action.register%%) 一个新��, "
+"或使用 [OpenID](%%action.openidlogin%%). "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "%2$s 上 %1$s 的更新�"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "所有匹��索�件\"%s\"的消�"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "连接"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "用�超过140个字符�述您自己和您的爱好"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "用�超过140个字符�述您自己和您的爱好"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "自述过长(�能超过140字符)。"
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "�是有效的个人信�URL(没有YADIS数�)。"
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "那是一个本地资料�需�登录�能订阅。"
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "无法获得一份请求标记。"
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%s 的通告��"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%s 的通告��"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "%s 的通告��"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "��给 %1$s 的 %2$s 消�"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s 好�的��"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s 好�的��"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s 好�的��"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "%s 的�件箱"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "消�已�布。"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "这个页���供您想�的媒体类型"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s 的通告��"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+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:249
+#, 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:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr "订阅已被拒�，但是没有回传URL。请到此网站查看如何拒�订阅。"
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "无法访问头�URL '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "'%s' 图�格�错误"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "无法�定�到�务器：%s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet软件注册�"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "无法更新已确认的电�邮件。"
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "振铃呼��出。"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "您的消�包� %d 个字符，超出长度�制 - �能超过 140 个字符。"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "您的消�包� %d 个字符，超出长度�制 - �能超过 140 个字符。"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "无法删除通告。"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "�存通告时出错。"
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "没有验��"
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "登入本站"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "选择��商"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "用�超过140个字符�述您自己和您的爱好"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "用�超过140个字符�述您自己和您的爱好"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "新通告"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s 收�了您的通告"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " 从 "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "无法获�收�的通告。"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "删除通告"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo
index 9bdfbaf9f..1ce207269 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.mo
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 4f1168601..41343732d 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -1,3 +1,6 @@
+# Translation of StatusNet to Traditional Chinese
+#
+# --
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -5,26 +8,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-12 16:21+0000\n"
-"Last-Translator: Evan Prodromou <evan@status.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:55+0000\n"
+"Language-Team: Traditional Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: zh-hant\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "�尋 \"%s\"相關資料"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr "�包�這些個人資料：密碼�電�信箱�線上�時通信箱�電話號碼"
@@ -35,17 +39,19 @@ msgid " from "
 msgstr ""
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -77,6 +83,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "�在%1$s在%2$s�為你的粉絲囉"
@@ -100,25 +107,28 @@ msgstr ""
 "敬上。\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s的狀態是%2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s的公開內容"
@@ -128,40 +138,55 @@ msgstr "%s的公開內容"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s與好�"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -170,7 +195,8 @@ msgstr ""
 "**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所�供的微型"
 "部�格�務"
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%**是個微型部�格"
@@ -182,30 +208,34 @@ msgstr "必須注明作者姓�或昵稱."
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64個�寫英文字�或數字，勿加標點符號或空格"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6個以上字元"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6個或6個以上字元，別忘了自己密碼喔"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr ""
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -213,6 +243,7 @@ msgid ""
 msgstr "確�信已寄到你的線上�時通信箱。%s�給你得訊��先經�你的��。"
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -242,7 +273,34 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
@@ -265,16 +323,23 @@ msgstr ""
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "關於"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "接�"
 
@@ -285,6 +350,9 @@ msgstr "接�"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "新增"
 
@@ -302,27 +370,29 @@ msgstr ""
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
 #: actions/imsettings.php:40 actions/smssettings.php:39
 #: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "ä¿¡ç®±"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "所有訂閱"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "%s的所有新增內容"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "所有符� \"%s\"的更新"
@@ -332,30 +402,37 @@ msgstr "所有符� \"%s\"的更新"
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "已登入"
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "此帳號已註冊"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "註冊確�"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "未來在�一部電腦自動登入"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -363,15 +440,19 @@ msgstr ""
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "個人圖�"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "更新個人圖�"
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -381,13 +462,14 @@ msgstr ""
 "好�清單了嗎？)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
@@ -399,6 +481,8 @@ msgstr "之�的內容»"
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "自我介紹"
 
@@ -406,16 +490,18 @@ msgstr "自我介紹"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "自我介紹�長(共140個字元)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr ""
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "無法讀�此%sURL的圖�"
@@ -423,6 +509,8 @@ msgstr "無法讀�此%sURL的圖�"
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "無法存�新密碼"
 
@@ -430,31 +518,34 @@ msgstr "無法存�新密碼"
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
 #: actions/imsettings.php:59 actions/smssettings.php:62
 #: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "�消"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "無法�始化OpenID用戶�象(consumer object)"
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "此JabberID錯誤"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr ""
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "更改"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr ""
 
@@ -464,11 +555,12 @@ msgid "Change password"
 msgstr "更改密碼"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr ""
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr ""
 
@@ -478,6 +570,9 @@ msgstr ""
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "確�"
 
@@ -490,12 +585,14 @@ msgstr "確�信箱"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "確��消"
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr ""
 
@@ -504,7 +601,8 @@ msgstr ""
 msgid "Confirmation code not found."
 msgstr "確�碼�失"
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -524,20 +622,24 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "連�"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "與�有帳號連�"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "好��單"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "無法從 %s 建立OpenID"
@@ -545,35 +647,39 @@ msgstr "無法從 %s 建立OpenID"
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr ""
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "無法連�到伺�器:%s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "無法存�個人圖�資料"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "無法存�新的個人資料"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr ""
 
@@ -593,15 +699,17 @@ msgstr "無法轉�請求標記以致無法存�標記"
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "無法�消信箱確�"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "無法刪除帳號"
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr ""
 
@@ -614,29 +722,38 @@ msgstr "無法�得轉�標記"
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "無法輸入確�碼"
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
 msgstr "無法新增訂閱"
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "無法儲存個人資料"
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -652,42 +769,48 @@ msgstr ""
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "無法更新使用者"
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "新增"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "以此暱稱新增使用者"
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "新增帳號"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "該OpenID已經注冊"
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "目�已確�的Jabber/Gtalk地�"
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -696,23 +819,27 @@ msgid "Currently"
 msgstr "目�"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "增加回覆時,資料庫發生錯誤: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr ""
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "請在140個字以內�述你自己與你的興趣"
 
@@ -720,11 +847,13 @@ msgstr "請在140個字以內�述你自己與你的興趣"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "電�信箱"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr ""
 
@@ -734,39 +863,43 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "此電�信箱已註冊�了"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "確�信箱"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr ""
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "請輸入暱稱或電�信箱"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "授權錯誤(Error authorizing token)"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "連接OpenID時發生錯誤"
 
@@ -777,39 +910,46 @@ msgstr "連接用戶時發生錯誤(Error connecting user.)"
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "個人圖��入錯誤"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "新的更人資料輸入錯誤"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "儲存信箱確�發生錯誤"
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "儲存�端個人資料發生錯誤"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "儲存個人資料發生錯誤"
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "儲存使用者發生錯誤"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "儲存使用者發生錯誤;使用者�稱無效"
 
@@ -818,6 +958,9 @@ msgstr "儲存使用者發生錯誤;使用者�稱無效"
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "使用者設定發生錯誤"
 
@@ -828,6 +971,7 @@ msgstr "更新個人資料發生錯誤"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "更新�端個人資料發生錯誤"
 
@@ -837,33 +981,36 @@ msgid "Error with confirmation code."
 msgstr "確�碼發生錯誤"
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "這個暱稱已有人用了喔"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "常見�題"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "無法上傳個人圖�"
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "發�給%s好�的訂閱"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "回應給%s的訂閱"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
@@ -878,7 +1025,7 @@ msgstr ""
 msgid "Find people on this site"
 msgstr ""
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -889,6 +1036,11 @@ msgstr "為安全起見，請先�新輸入你的使用者�稱與密碼�更
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "全�"
 
@@ -897,23 +1049,33 @@ msgstr "全�"
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "全��長（最多255字元）"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "求救"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 msgid "Home"
 msgstr "主�"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "個人首�"
 
@@ -921,21 +1083,27 @@ msgstr "個人首�"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "個人首���錯誤"
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr ""
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr ""
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "線上�時通信箱"
 
@@ -945,19 +1113,19 @@ msgid "IM Settings"
 msgstr "線上�時通設定"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr "若已經註冊�了，請輸入使用者�稱與密碼連�到你的OpenID。"
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr "若想新增OpenID到你的帳號，請在下方空格輸入並勾�『新增�"
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -966,55 +1134,62 @@ msgstr ""
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "舊密碼錯誤"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "使用者�稱或密碼錯誤"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "我們已寄出一�信到你帳號中的信箱，告訴你如何�回你的密碼。"
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "個人圖�連�%s無效"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "個人首�連�%s無效"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr ""
 
@@ -1029,13 +1204,13 @@ msgid "Invalid notice url"
 msgstr ""
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "個人資料連�%s無效"
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "個人資料連�無效(格�錯誤)"
 
@@ -1053,28 +1228,35 @@ msgstr "尺寸錯誤"
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "使用者�稱或密碼無效"
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr ""
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1083,11 +1265,12 @@ msgid ""
 msgstr ""
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "此Jabber ID已有人使用"
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1095,12 +1278,14 @@ msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr ""
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
@@ -1109,7 +1294,15 @@ msgstr ""
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "地點"
 
@@ -1118,7 +1311,12 @@ msgstr "地點"
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "地點�長（共255個字）"
 
@@ -1127,18 +1325,22 @@ msgstr "地點�長（共255個字）"
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "登入"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "用OpenID(%%doc.openid%%)帳號登入"
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1146,22 +1348,26 @@ msgid ""
 "%). "
 msgstr ""
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "登出"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "�失或忘記密碼了嗎？"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -1172,16 +1378,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "何時加入會員的呢？"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "&s的微型部�格"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1191,42 +1399,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 msgid "My text and files are available under "
 msgstr ""
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "新暱稱"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 msgid "New notice"
 msgstr "新訊�"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "新密碼"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "新密碼已儲存�功。你已登入。"
 
@@ -1236,7 +1452,13 @@ msgstr "新密碼已儲存�功。你已登入。"
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -1245,7 +1467,12 @@ msgstr "暱稱"
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "此暱稱已有人使用。�試試看別的�。"
 
@@ -1254,47 +1481,58 @@ msgstr "此暱稱已有人使用。�試試看別的�。"
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "暱稱請用�寫字�或數字，勿加空格。"
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "此暱稱無法使用"
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "你想�為誰的粉絲呢？請輸入他/她的暱稱。"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "暱稱或信箱"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr ""
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "查無此Jabber ID"
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "無確�請求"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr ""
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr ""
 
@@ -1306,11 +1544,15 @@ msgstr "無確�碼"
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "無內容"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr ""
 
@@ -1319,7 +1561,9 @@ msgid "No id."
 msgstr ""
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr ""
 
@@ -1330,6 +1574,7 @@ msgstr "無�端伺�器�供的暱稱"
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "無暱稱"
 
@@ -1337,12 +1582,14 @@ msgstr "無暱稱"
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr ""
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr ""
 
@@ -1352,7 +1599,8 @@ msgid "No profile URL returned by server."
 msgstr ""
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "查無此使用者所註冊的信箱"
 
@@ -1364,7 +1612,7 @@ msgstr "目�無請求"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "無�果"
 
@@ -1375,12 +1623,16 @@ msgstr "無尺寸"
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1390,13 +1642,15 @@ msgid "No such OpenID."
 msgstr "ç„¡æ­¤OpenID"
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 msgid "No such document."
 msgstr "無此文件"
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "無此通知"
 
@@ -1434,12 +1688,22 @@ msgstr "無此訂閱"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "無此使用者"
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr ""
 
@@ -1453,32 +1717,38 @@ msgid "Not a recovery code."
 msgstr "此�復碼錯誤"
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr ""
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "此JabberID無效"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "此OpenID無效"
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "此信箱無效"
 
@@ -1486,6 +1756,11 @@ msgstr "此信箱無效"
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1505,7 +1780,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr ""
 
@@ -1516,11 +1792,13 @@ msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr ""
 
@@ -1536,11 +1814,15 @@ msgstr ""
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr ""
 
@@ -1557,39 +1839,44 @@ msgid "Notice feed for %s"
 msgstr ""
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
 msgstr ""
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr ""
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr ""
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr ""
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr ""
 
@@ -1597,29 +1884,34 @@ msgstr ""
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
+#: actions/openidlogin.php:111
 msgid "OpenID URL"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr ""
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr ""
@@ -1635,11 +1927,12 @@ msgid "OpenID settings"
 msgstr ""
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr ""
 
@@ -1649,34 +1942,46 @@ msgstr ""
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr ""
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr ""
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 msgid "Password must be 6 chars or more."
 msgstr ""
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 msgid "Password recovery requested"
 msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 msgid "Password saved."
 msgstr ""
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr ""
 
@@ -1696,14 +2001,17 @@ msgid "People search"
 msgstr ""
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr ""
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr ""
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
@@ -1715,7 +2023,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
@@ -1724,7 +2032,9 @@ msgstr ""
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr ""
 
@@ -1733,42 +2043,52 @@ msgstr ""
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr ""
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr ""
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr ""
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr ""
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr ""
 
@@ -1777,17 +2097,19 @@ msgid "Public Stream Feed"
 msgstr ""
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr ""
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
@@ -1797,12 +2119,14 @@ msgid "Recent Tags"
 msgstr ""
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr ""
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr ""
 
@@ -1815,37 +2139,45 @@ msgstr ""
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr ""
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr ""
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr ""
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr ""
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr ""
 
@@ -1859,6 +2191,9 @@ msgstr ""
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr ""
 
@@ -1867,41 +2202,48 @@ msgstr ""
 msgid "Remove OpenID"
 msgstr ""
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr ""
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr ""
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr ""
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr ""
 
@@ -1910,17 +2252,18 @@ msgstr ""
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr ""
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr ""
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -1933,12 +2276,21 @@ msgstr ""
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr ""
 
@@ -1948,14 +2300,14 @@ msgid "Search Stream Feed"
 msgstr ""
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 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 ""
 
-#: ../actions/peoplesearch.php:28
+#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -1963,48 +2315,56 @@ msgid ""
 msgstr ""
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 msgid "Send"
 msgstr ""
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr ""
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr ""
 
@@ -2024,27 +2384,32 @@ msgid "Something weird happened."
 msgstr ""
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr ""
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 msgid "Statistics"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr ""
 
@@ -2052,24 +2417,28 @@ msgstr ""
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 msgid "Subscribe"
 msgstr ""
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr ""
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr ""
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr ""
 
@@ -2077,28 +2446,35 @@ msgstr ""
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr ""
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr ""
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr ""
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr ""
 
@@ -2118,6 +2494,7 @@ msgid "That confirmation code is not for you!"
 msgstr ""
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr ""
 
@@ -2127,63 +2504,73 @@ msgid "That file is too big."
 msgstr ""
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr ""
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr ""
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr ""
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
@@ -2192,18 +2579,22 @@ msgstr ""
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr ""
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2211,40 +2602,45 @@ msgid ""
 msgstr ""
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr ""
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2256,6 +2652,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
@@ -2264,25 +2663,37 @@ msgstr ""
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -2291,18 +2702,21 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
@@ -2314,15 +2728,22 @@ msgstr ""
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr ""
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr ""
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr ""
 
@@ -2351,38 +2772,47 @@ msgstr ""
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr ""
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr ""
 
@@ -2399,12 +2829,15 @@ msgid "Upload a new profile image"
 msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
@@ -2428,11 +2861,16 @@ msgstr ""
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr ""
 
@@ -2441,29 +2879,33 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
@@ -2471,7 +2913,9 @@ msgstr ""
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr ""
 
@@ -2492,11 +2936,12 @@ msgid "You are already logged in!"
 msgstr ""
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2514,20 +2959,22 @@ msgstr ""
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -2536,21 +2983,23 @@ msgstr ""
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2564,82 +3013,96 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr ""
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144 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 ""
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr ""
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: ../actions/openidsettings.php:28
+#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr ""
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr ""
 
@@ -2661,12 +3124,14 @@ msgid "reply"
 msgstr ""
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr ""
 
@@ -2687,6 +3152,26 @@ msgstr ""
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 actions/newnotice.php:96
+#: actions/openidsettings.php:188 actions/othersettings.php:136
+#: actions/passwordsettings.php:131 actions/profilesettings.php:172
+#: actions/register.php:113 actions/remotesubscribe.php:53
+#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2695,6 +3180,7 @@ msgid "This notice is not a favorite!"
 msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -2702,22 +3188,28 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2727,11 +3219,13 @@ msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr ""
@@ -2771,33 +3265,44 @@ msgid "Login with your username and password. "
 msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr ""
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr ""
 
@@ -2851,6 +3356,11 @@ msgstr ""
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr ""
 
@@ -2879,6 +3389,8 @@ msgid "New password successfully saved. "
 msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -2899,12 +3411,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
 msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -2912,7 +3427,7 @@ msgstr ""
 msgid "No such message."
 msgstr ""
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
@@ -2936,51 +3451,70 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
@@ -2999,14 +3533,17 @@ msgid ""
 msgstr ""
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr ""
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr ""
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr ""
 
@@ -3015,6 +3552,7 @@ msgid "Twitter Username"
 msgstr ""
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr ""
 
@@ -3023,24 +3561,29 @@ msgid "Twitter Password"
 msgstr ""
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -3051,33 +3594,43 @@ msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -3094,18 +3647,19 @@ msgid "The subscription has been rejected, but no "
 msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
@@ -3115,89 +3669,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3205,11 +3781,11 @@ msgstr ""
 msgid "Commands:\n"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr ""
 
@@ -3224,7 +3800,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -3236,7 +3812,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
@@ -3245,31 +3821,39 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr ""
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr ""
 
@@ -3282,14 +3866,19 @@ msgid "Twitter integration options"
 msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s與好�"
@@ -3299,22 +3888,32 @@ msgid "You can upload your personal avatar."
 msgstr ""
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "線上�時通設定"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
@@ -3331,35 +3930,44 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "無此通知"
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr ""
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "無此使用者"
@@ -3368,11 +3976,11 @@ msgstr "無此使用者"
 msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr ""
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3389,40 +3997,58 @@ msgstr ""
 msgid "Add to favorites"
 msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, fuzzy
 msgid "No nickname"
 msgstr "無暱稱"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 #, fuzzy
 msgid "No such group"
 msgstr "無此通知"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3432,16 +4058,17 @@ msgid "Nickname must have only lowercase letters "
 msgstr "暱稱請用�寫字�或數字，勿加空格。"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 #, fuzzy
 msgid "description is too long (max 140 chars)."
 msgstr "自我介紹�長(共140個字元)"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 #, fuzzy
 msgid "Could not update group."
 msgstr "無法更新使用者"
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr ""
 
@@ -3458,7 +4085,8 @@ msgstr ""
 msgid "Send me email when someone "
 msgstr ""
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
@@ -3472,7 +4100,7 @@ msgstr "此電�信箱已註冊�了"
 msgid "A confirmation code was sent to the email address you added. "
 msgstr "確�信已寄到你的線上�時通信箱。%s�給你得訊��先經�你的��。"
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3486,53 +4114,68 @@ msgstr ""
 msgid "Allow %s to update my Facebook status"
 msgstr ""
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "無內容"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 msgid "After"
 msgstr ""
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "之�的內容»"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "發�給%s好�的訂閱"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3575,12 +4218,14 @@ msgstr ""
 msgid "Sync preferences"
 msgstr ""
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr ""
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "無此通知"
@@ -3595,7 +4240,8 @@ msgid "The most popular notices on the site right now."
 msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3609,15 +4255,17 @@ msgstr ""
 msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr ""
 
@@ -3625,12 +4273,14 @@ msgstr ""
 msgid "You can upload a logo image for your group."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 #, fuzzy
 msgid "Logo updated."
 msgstr "更新個人圖�"
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "無法上傳個人圖�"
@@ -3650,7 +4300,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
@@ -3665,6 +4316,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "新增帳號"
@@ -3675,7 +4327,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr ""
 
@@ -3697,20 +4349,20 @@ msgstr ""
 msgid "A confirmation code was sent "
 msgstr "無確�碼"
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr ""
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "無法連�到伺�器:%s"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
 msgstr ""
@@ -3719,16 +4371,19 @@ msgstr ""
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 #, fuzzy
 msgid "No such group."
 msgstr "無此通知"
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 msgid "You are not a member of that group."
 msgstr ""
 
@@ -3736,21 +4391,25 @@ msgstr ""
 msgid "You may not leave a group while you are its administrator."
 msgstr ""
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
 msgstr ""
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "無法從 %s 建立OpenID"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr ""
 
@@ -3762,16 +4421,18 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
 msgid "Could not create group."
 msgstr "無法存�個人圖�資料"
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "註冊失敗"
@@ -3784,11 +4445,14 @@ msgstr ""
 msgid "Don't send a message to yourself; "
 msgstr ""
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr ""
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr ""
 
@@ -3805,7 +4469,7 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 msgid "OpenID login"
 msgstr ""
 
@@ -3830,11 +4494,13 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "地點�長（共255個字）"
@@ -3844,16 +4510,17 @@ msgstr "地點�長（共255個字）"
 msgid "Change your password."
 msgstr "更改密碼"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr ""
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "此信箱無效"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr ""
@@ -3863,11 +4530,12 @@ msgstr ""
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 msgid "Profile information"
 msgstr ""
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -3877,21 +4545,26 @@ msgid "Automatically subscribe to whoever "
 msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "個人首�連�%s無效"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "無法儲存個人資料"
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
@@ -3911,11 +4584,13 @@ msgstr ""
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -3967,7 +4642,8 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr ""
@@ -3977,52 +4653,73 @@ msgstr ""
 msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "無此通知"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 msgid "Note"
 msgstr ""
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, php-format
 msgid "Notice feed for %s group"
 msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "何時加入會員的呢？"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr ""
 
@@ -4037,7 +4734,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4048,32 +4745,39 @@ msgid "'s profile"
 msgstr "無此通知"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "無此通知"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 msgid "User actions"
 msgstr ""
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 msgid "Message"
 msgstr ""
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "所有訂閱"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr ""
 
@@ -4098,7 +4802,7 @@ msgstr ""
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "確�信已寄到你的線上�時通信箱。%s�給你得訊��先經�你的��。"
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr ""
 
@@ -4159,17 +4863,18 @@ msgstr ""
 msgid "These are the people whose "
 msgstr ""
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "查無此Jabber ID"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "&s的微型部�格"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr ""
@@ -4193,7 +4898,7 @@ msgstr ""
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4203,17 +4908,17 @@ msgstr ""
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "無法存�個人圖�資料"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4222,20 +4927,23 @@ msgstr ""
 msgid "No such tag."
 msgstr "無此通知"
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "&s的微型部�格"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "目�無請求"
@@ -4244,16 +4952,17 @@ msgstr "目�無請求"
 msgid "Add your Twitter account to automatically send "
 msgstr ""
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 msgid "Twitter user name"
 msgstr ""
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 #, fuzzy
 msgid "Twitter password"
 msgstr "新密碼"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr ""
 
@@ -4266,155 +4975,164 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr "無法�消信箱確�"
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "儲存使用者發生錯誤"
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "無確�請求"
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr ""
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "此帳號已註冊"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr ""
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "儲存使用者發生錯誤"
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 #, fuzzy
 msgid "Upload an avatar"
 msgstr "無法上傳個人圖�"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr ""
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr ""
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Account"
 msgstr "關於"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "新增帳號"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "ç„¡æ­¤OpenID"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "求救"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "新訊�"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "新訊�"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 msgid "Secondary site navigation"
 msgstr ""
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "無此使用者"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr ""
 
@@ -4427,12 +5145,15 @@ msgstr ""
 msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "新增帳號"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr ""
 
@@ -4453,33 +5174,38 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
 msgstr "所有訂閱"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "請在140個字以內�述你自己與你的興趣"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
@@ -4488,21 +5214,21 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 #, fuzzy
 msgid "Logo"
 msgstr "登出"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
@@ -4534,12 +5260,12 @@ msgstr "登入"
 msgid "Leave"
 msgstr ""
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "使用者�稱或密碼無效"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "新增帳號"
@@ -4560,24 +5286,24 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "�在%1$s在%2$s�為你的粉絲囉"
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
-msgstr ""
+msgstr "地點"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
-msgstr ""
+msgstr "個人首�"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
@@ -4592,41 +5318,49 @@ msgstr ""
 msgid "%1$s just added your notice from %2$s"
 msgstr "�在%1$s在%2$s�為你的粉絲囉"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "新訊�"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6個以上字元"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 msgid "in reply to"
 msgstr ""
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 msgid "Delete this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 msgid "Delete"
 msgstr ""
 
@@ -4647,27 +5381,29 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr ""
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr ""
 
@@ -4684,31 +5420,33 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "無此訂閱"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "此帳號已註冊"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr ""
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 msgid "Subscribe to this user"
 msgstr ""
 
@@ -4721,11 +5459,12 @@ msgid "Top posters"
 msgstr ""
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 #, fuzzy
 msgid "Unblock this user"
 msgstr "無此使用者"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr ""
 
@@ -4733,20 +5472,1970 @@ msgstr ""
 msgid "Unsubscribe from this user"
 msgstr ""
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "發�給%s好�的訂閱"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "發�給%s好�的訂閱"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "發�給%s好�的訂閱"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s與好�"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "更新個人圖�"
+
+#: actions/block.php:129 actions/block.php:136
+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 ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "&s的微型部�格"
+
+#: actions/groupsearch.php:57 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 ""
+
+#: 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 ""
+
+#: actions/newmessage.php:102
+msgid "Only logged-in users can send direct messages."
+msgstr ""
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "�尋 \"%s\"相關資料"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr "為安全起見，請先�新輸入你的使用者�稱與密碼�更改設定。"
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr ""
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr ""
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "%s的公開內容"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, 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 ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "�包�這些個人資料：密碼�電�信箱�線上�時通信箱�電話號碼"
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "新增"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, 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 ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "無此通知"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "無此通知"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr ""
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "個人圖�"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "線上�時通設定"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, 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 ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "確�信已寄到你的線上�時通信箱。%s�給你得訊��先經�你的��。"
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "無此使用者"
+
+#: actions/twittersettings.php:72
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "無法�消信箱確�"
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
+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/usergroups.php:131 actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: lib/action.php:406 lib/action.php:425
+msgid "Connect to SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "若已經註冊�了，請輸入使用者�稱與密碼連�到你的OpenID。"
+
+#: 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/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, 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 ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, 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 ""
+"�在%1$s在%2$s�為你的粉絲囉。\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"\n"
+"%4$s.\n"
+"敬上。\n"
+
+#: lib/mail.php:466
+#, 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 ""
+
+#: lib/mail.php:513
+#, 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 ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$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"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+msgid "Search site"
+msgstr ""
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "無此文件"
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "無法連�到伺�器:%s"
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "無此使用者"
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "無此通知"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s與好�"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "無此使用者"
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "地點"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "無此通知"
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "個人首�連�%s無效"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "此暱稱已有人使用。�試試看別的�。"
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "新增帳號"
+msgid "Could not create aliases."
+msgstr "無法存�個人圖�資料"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "無法確�信箱"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#~ msgid "Email address"
-#~ msgstr "電�信箱"
+#: 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 ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "新增訊�時發生錯誤"
+#: 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 ""
 
-#~ msgid ""
-#~ "If you've forgotten or lost your password, you can get a new one sent  "
-#~ "the email address you have stored  in your account."
-#~ msgstr "若忘記或�失密碼，我們會寄新的密碼到你帳號中的信箱。"
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "新訊�"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "新訊�"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "此信箱無效"
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr ""
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr ""
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "無此使用者"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "無法更新使用者"
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+msgid "Design preferences saved."
+msgstr ""
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "無�果"
+
+#: 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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr ""
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+msgid "Message sent"
+msgstr ""
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "無法儲存個人資料"
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: 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 ""
+
+#: actions/openidsettings.php:70
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+msgid "View profile designs"
+msgstr ""
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, 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 ""
+
+#: 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 ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've 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've been identified. Enter a new password below. "
+msgstr ""
+
+#: actions/recoverpassword.php:188
+msgid "Password recover"
+msgstr ""
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "確�碼發生錯誤"
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr ""
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "無此通知"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+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:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr ""
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr ""
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, 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 ""
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "無此使用者"
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:121
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, 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 ""
+
+#: 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
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, 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:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "�在%1$s在%2$s�為你的粉絲囉"
+
+#: actions/tag.php:77 actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:91 actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "無法更新使用者"
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "無法更新使用者"
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s的狀態是%2$s"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "&s的微型部�格"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "所有訂閱"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr ""
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr ""
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "儲存使用者發生錯誤"
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "無此通知"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr ""
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "無此通知"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "更改密碼"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "連�"
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "登入"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "無此使用者"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "無此使用者"
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "無內容"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+msgid "Search help"
+msgstr ""
+
+#: 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/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "個人首���錯誤"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "無此通知"
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "無法連�到伺�器:%s"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "自我介紹�長(共140個字元)"
+
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr ""
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "無法連�到伺�器:%s"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "無法連�到伺�器:%s"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "無法從 %s 建立OpenID"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "無此通知"
+
+#: actions/apigrouplist.php:103
+#, php-format
+msgid "Groups %s is a member of on %s."
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "更新個人圖�"
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr ""
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "自我介紹�長(共140個字元)"
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "&s的微型部�格"
+
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "無法轉�請求標記以致無法存�標記"
+
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr ""
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "無此通知"
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "無此通知"
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "&s的微型部�格"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "個人首���錯誤"
+
+#: actions/login.php:259
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "&s的微型部�格"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "所有符� \"%s\"的更新"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "連�"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "請在140個字以內�述你自己與你的興趣"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "請在140個字以內�述你自己與你的興趣"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "自我介紹�長(共140個字元)"
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no 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 "無法�得轉�標記"
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "發�給%s好�的訂閱"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "發�給%s好�的訂閱"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "發�給%s好�的訂閱"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "&s的微型部�格"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "發�給%s好�的訂閱"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "發�給%s好�的訂閱"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "發�給%s好�的訂閱"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "無此通知"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "更新個人圖�"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "個人首���錯誤"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "發�給%s好�的訂閱"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: 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:249
+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:261
+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:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "無法讀�此%sURL的圖�"
+
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr ""
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "無法連�到伺�器:%s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "新訊�"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "無法更新使用者"
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, php-format
+msgid "Reply to %s sent"
+msgstr ""
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "儲存使用者發生錯誤"
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\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"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\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"
+"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:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "無確�碼"
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "請在140個字以內�述你自己與你的興趣"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "請在140個字以內�述你自己與你的興趣"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "新訊�"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "�在%1$s在%2$s�為你的粉絲囉"
+
+#: lib/mail.php:556
+#, 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 ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, 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"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "無法更新使用者"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "新訊�"
diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php
index aa57b3915..379390ffd 100644
--- a/plugins/Autocomplete/autocomplete.php
+++ b/plugins/Autocomplete/autocomplete.php
@@ -98,11 +98,10 @@ class AutocompleteAction extends Action
             $user = new User();
             $user->limit($limit);
             $user->whereAdd('nickname like \'' . trim($user->escape($q), '\'') . '%\'');
-            $user->find();
-            while($user->fetch()) {
-                $profile = Profile::staticGet($user->id);
-                $user->profile=$profile;
-                $this->users[]=$user;
+            if($user->find()){
+                while($user->fetch()) {
+                    $this->users[]=clone($user);
+                }
             }
         }
         if(substr($q,0,1)=='!'){
@@ -111,9 +110,10 @@ class AutocompleteAction extends Action
             $group = new User_group();
             $group->limit($limit);
             $group->whereAdd('nickname like \'' . trim($group->escape($q), '\'') . '%\'');
-            $group->find();
-            while($group->fetch()) {
-                $this->groups[]=$group;
+            if($group->find()){
+                while($group->fetch()) {
+                    $this->groups[]=clone($group);
+                }
             }
         }
         return true;
@@ -124,7 +124,8 @@ class AutocompleteAction extends Action
         parent::handle($args);
         $results = array();
         foreach($this->users as $user){
-            $results[]=array('nickname' => $user->nickname, 'fullname'=> $user->profile->fullname, 'type'=>'user');
+            $profile = $user->getProfile();
+            $results[]=array('nickname' => $user->nickname, 'fullname'=> $profile->fullname, 'type'=>'user');
         }
         foreach($this->groups as $group){
             $results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group');
diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php
new file mode 100644
index 000000000..478ef99d2
--- /dev/null
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to push RSS/Atom updates to a PubSubHubBub hub
+ *
+ * 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  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+class BitlyUrlPlugin extends Plugin
+{
+    function __construct()
+    {
+        parent::__construct();
+    }
+
+    function onInitializePlugin(){
+        $this->registerUrlShortener(
+            'bit.ly',
+            array(),
+            array('BitlyUrl',array('http://bit.ly/api?method=shorten&long_url='))
+        );
+    }
+}
+
+class BitlyUrl extends ShortUrlApi
+{
+    protected function shorten_imp($url) {
+        $response = $this->http_get($url);
+        if(!$response){
+            return $url;
+        }else{
+            return current(json_decode($response)->results)->hashUrl;
+        }
+    }
+}
+
diff --git a/plugins/BlogspamNetPlugin.php b/plugins/BlogspamNetPlugin.php
index c14569746..51236001a 100644
--- a/plugins/BlogspamNetPlugin.php
+++ b/plugins/BlogspamNetPlugin.php
@@ -22,6 +22,7 @@
  * @category  Plugin
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
+ * @author    Brion Vibber <brion@status.net>
  * @copyright 2009 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/
@@ -69,14 +70,12 @@ class BlogspamNetPlugin extends Plugin
     {
         $args = $this->testArgs($notice);
         common_debug("Blogspamnet args = " . print_r($args, TRUE));
-        $request = xmlrpc_encode_request('testComment', array($args));
-        $context = stream_context_create(array('http' => array('method' => "POST",
-                                                               'header' =>
-                                                               "Content-Type: text/xml\r\n".
-                                                               "User-Agent: " . $this->userAgent(),
-                                                               'content' => $request)));
-        $file = file_get_contents($this->baseUrl, false, $context);
-        $response = xmlrpc_decode($file);
+        $requestBody = xmlrpc_encode_request('testComment', array($args));
+
+        $request = HTTPClient::start();
+        $httpResponse = $request->post($this->baseUrl, array('Content-Type: text/xml'), $requestBody);
+
+        $response = xmlrpc_decode($httpResponse->getBody());
         if (xmlrpc_is_fault($response)) {
             throw new ServerException("$response[faultString] ($response[faultCode])", 500);
         } else {
diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php
index 80ef44cc9..e18957c36 100644
--- a/plugins/GeonamesPlugin.php
+++ b/plugins/GeonamesPlugin.php
@@ -74,8 +74,8 @@ class GeonamesPlugin extends Plugin
 
         $result = $client->get('http://ws.geonames.org/search?'.$str);
 
-        if ($result->code == "200") {
-            $rj = json_decode($result->body);
+        if ($result->isOk()) {
+            $rj = json_decode($result->getBody());
             if (count($rj->geonames) > 0) {
                 $n = $rj->geonames[0];
 
@@ -121,9 +121,9 @@ class GeonamesPlugin extends Plugin
 
         $result = $client->get('http://ws.geonames.org/hierarchyJSON?'.$str);
 
-        if ($result->code == "200") {
+        if ($result->isOk()) {
 
-            $rj = json_decode($result->body);
+            $rj = json_decode($result->getBody());
 
             if (count($rj->geonames) > 0) {
 
@@ -182,9 +182,9 @@ class GeonamesPlugin extends Plugin
         $result =
           $client->get('http://ws.geonames.org/findNearbyPlaceNameJSON?'.$str);
 
-        if ($result->code == "200") {
+        if ($result->isOk()) {
 
-            $rj = json_decode($result->body);
+            $rj = json_decode($result->getBody());
 
             if (count($rj->geonames) > 0) {
 
@@ -249,9 +249,9 @@ class GeonamesPlugin extends Plugin
 
         $result = $client->get('http://ws.geonames.org/hierarchyJSON?'.$str);
 
-        if ($result->code == "200") {
+        if ($result->isOk()) {
 
-            $rj = json_decode($result->body);
+            $rj = json_decode($result->getBody());
 
             if (count($rj->geonames) > 0) {
 
diff --git a/plugins/Ldap/LdapPlugin.php b/plugins/Ldap/LdapPlugin.php
new file mode 100644
index 000000000..755562f54
--- /dev/null
+++ b/plugins/Ldap/LdapPlugin.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to enable LDAP Authentication and Authorization
+ *
+ * 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  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @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);
+}
+
+require_once INSTALLDIR.'/plugins/Ldap/ldap.php';
+
+class LdapPlugin extends Plugin
+{
+    private $config = array();
+
+    function __construct()
+    {
+        parent::__construct();
+    }
+
+    function onCheckPassword($nickname, $password, &$authenticated)
+    {
+        if(ldap_check_password($nickname, $password)){
+            $authenticated = true;
+            //stop handling of other events, because we have an answer
+            return false;
+        }
+        if(common_config('ldap','authoritative')){
+            //a false return stops handler processing
+            return false;
+        }
+    }
+
+    function onAutoRegister($nickname)
+    {
+        $user = User::staticGet('nickname', $nickname);
+        if (! is_null($user) && $user !== false) {
+            common_log(LOG_WARNING, "An attempt was made to autoregister an existing user with nickname: $nickname");
+            return;
+        }
+
+        $attributes=array();
+        $config_attributes = array('nickname','email','fullname','homepage','location');
+        foreach($config_attributes as $config_attribute){
+            $value = common_config('ldap', $config_attribute.'_attribute');
+            if($value!==false){
+                array_push($attributes,$value);
+            }
+        }
+        $entry = ldap_get_user($nickname,$attributes);
+        if($entry){
+            $registration_data = array();
+            foreach($config_attributes as $config_attribute){
+                $value = common_config('ldap', $config_attribute.'_attribute');
+                if($value!==false){
+                    if($config_attribute=='email'){
+                        $registration_data[$config_attribute]=common_canonical_email($entry->getValue($value,'single'));
+                    }else if($config_attribute=='nickname'){
+                        $registration_data[$config_attribute]=common_canonical_nickname($entry->getValue($value,'single'));
+                    }else{
+                        $registration_data[$config_attribute]=$entry->getValue($value,'single');
+                    }
+                }
+            }
+            //set the database saved password to a random string.
+            $registration_data['password']=common_good_rand(16);
+            $user = User::register($registration_data);
+            //prevent other handlers from running, as we have registered the user
+            return false;
+        }
+    }
+
+    function onChangePassword($nickname,$oldpassword,$newpassword,&$errormsg)
+    {
+        //TODO implement this
+        $errormsg = _('Sorry, changing LDAP passwords is not supported at this time');
+
+        //return false, indicating that the event has been handled
+        return false;
+    }
+}
diff --git a/plugins/Ldap/README b/plugins/Ldap/README
new file mode 100644
index 000000000..617738e0b
--- /dev/null
+++ b/plugins/Ldap/README
@@ -0,0 +1,23 @@
+The LDAP plugin allows for StatusNet to handle authentication, authorization, and user information through LDAP.
+
+Installation
+============
+Add configuration entries to config.php. These entries are:
+
+The following are documented at http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+$config['ldap']['binddn']
+$config['ldap']['bindpw']
+$config['ldap']['basedn']
+$config['ldap']['host']
+
+$config['ldap']['nickname_attribute'] Set this to the name of the ldap attribute that holds the username. For example, on Microsoft's Active Directory, this should be set to 'sAMAccountName'
+$config['ldap']['nickname_email'] Set this to the name of the ldap attribute that holds the user's email address. For example, on Microsoft's Active Directory, this should be set to 'mail'
+$config['ldap']['nickname_fullname'] Set this to the name of the ldap attribute that holds the user's full name. For example, on Microsoft's Active Directory, this should be set to 'displayName'
+$config['ldap']['nickname_homepage'] Set this to the name of the ldap attribute that holds the the url of the user's home page.
+$config['ldap']['nickname_location'] Set this to the name of the ldap attribute that holds the user's location.
+
+$config['ldap']['authoritative'] Set to true if LDAP's responses are authoritative (meaning if LDAP fails, do check the any other plugins or the internal password database)
+$config['ldap']['autoregister'] Set to true if users should be automatically created when they attempt to login
+
+Finally, add "addPlugin('ldap');" to the bottom of your config.php
+
diff --git a/plugins/Ldap/ldap.php b/plugins/Ldap/ldap.php
new file mode 100644
index 000000000..d92a058fb
--- /dev/null
+++ b/plugins/Ldap/ldap.php
@@ -0,0 +1,108 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+require_once 'Net/LDAP2.php';
+
+function ldap_get_config(){
+    static $config = null;
+    if($config == null){
+        $config = array();
+        $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','scope');
+        foreach($keys as $key){
+            $value = common_config('ldap', $key);
+            if($value!==false){
+                $config[$key]=$value;
+            }
+        }
+    }
+    return $config;
+}
+
+function ldap_get_connection($config = null){
+    if($config == null){
+        $config = ldap_get_config();
+    }
+    
+    //cannot use Net_LDAP2::connect() as StatusNet uses
+    //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
+    //PEAR handling can be overridden on instance objects, so we do that.
+    $ldap = new Net_LDAP2($config);
+    $ldap->setErrorHandling(PEAR_ERROR_RETURN);
+    $err=$ldap->bind();
+    if (Net_LDAP2::isError($err)) {
+        common_log(LOG_WARNING, 'Could not connect to LDAP server: '.$err->getMessage());
+        return false;
+    }
+    return $ldap;
+}
+
+function ldap_check_password($username, $password){
+    $ldap = ldap_get_connection();
+    if(!$ldap){
+        return false;
+    }
+    $entry = ldap_get_user($username);
+    if(!$entry){
+        return false;
+    }else{
+        $config = ldap_get_config();
+        $config['binddn']=$entry->dn();
+        $config['bindpw']=$password;
+        if(ldap_get_connection($config)){
+            return true;
+        }else{
+            return false;
+        }
+    }
+}
+
+/**
+ * get an LDAP entry for a user with a given username
+ * 
+ * @param string $username
+ * $param array $attributes LDAP attributes to retrieve
+ * @return string DN
+ */
+function ldap_get_user($username,$attributes=array()){
+    $ldap = ldap_get_connection();
+    $filter = Net_LDAP2_Filter::create(common_config('ldap','nickname_attribute'), 'equals',  $username);
+    $options = array(
+        'scope' => 'sub',
+        'attributes' => $attributes
+    );
+    $search = $ldap->search(null,$filter,$options);
+    
+    if (PEAR::isError($search)) {
+        common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage());
+        return false;
+    }
+
+    if($search->count()==0){
+        return false;
+    }else if($search->count()==1){
+        $entry = $search->shiftEntry();
+        return $entry;
+    }else{
+        common_log(LOG_WARNING, 'Found ' . $search->count() . ' ldap user with the username: ' . $username);
+        return false;
+    }
+}
+
diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php
index 7665b6c1e..852253b02 100644
--- a/plugins/LilUrl/LilUrlPlugin.php
+++ b/plugins/LilUrl/LilUrlPlugin.php
@@ -58,7 +58,10 @@ class LilUrl extends ShortUrlApi
         $y = @simplexml_load_string($response);
         if (!isset($y->body)) return $url;
         $x = $y->body->p[0]->a->attributes();
-        if (isset($x['href'])) return $x['href'];
+        if (isset($x['href'])) {
+            common_log(LOG_INFO, __CLASS__ . ": shortened $url to $x[href]");
+            return $x['href'];
+        }
         return $url;
     }
 }
diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php
index 60f7a60c7..915d15c07 100644
--- a/plugins/LinkbackPlugin.php
+++ b/plugins/LinkbackPlugin.php
@@ -129,18 +129,12 @@ class LinkbackPlugin extends Plugin
             }
         }
 
-        $request = xmlrpc_encode_request('pingback.ping', $args);
-        $context = stream_context_create(array('http' => array('method' => "POST",
-                                                               'header' =>
-                                                               "Content-Type: text/xml\r\n".
-                                                               "User-Agent: " . $this->userAgent(),
-                                                               'content' => $request)));
-        $file = file_get_contents($endpoint, false, $context);
-        if (!$file) {
-            common_log(LOG_WARNING,
-	               "Pingback request failed for '$url' ($endpoint)");
-        } else {
-            $response = xmlrpc_decode($file);
+        $request = HTTPClient::start();
+        try {
+            $response = $request->post($endpoint,
+                array('Content-Type: text/xml'),
+                xmlrpc_encode_request('pingback.ping', $args));
+            $response = xmlrpc_decode($response->getBody());
             if (xmlrpc_is_fault($response)) {
                 common_log(LOG_WARNING,
                        "Pingback error for '$url' ($endpoint): ".
@@ -150,6 +144,9 @@ class LinkbackPlugin extends Plugin
                        "Pingback success for '$url' ($endpoint): ".
                        "'$response'");
             }
+        } catch (HTTP_Request2_Exception $e) {
+            common_log(LOG_WARNING,
+                   "Pingback request failed for '$url' ($endpoint)");
         }
     }
 
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 9371326fe..e82b4dbfb 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -1,5 +1,31 @@
-// add a notice encoded as JSON into the current timeline
-//
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, StatusNet, Inc.
+ *
+ * Add a notice encoded as JSON into the current timeline
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 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/
+ */
+
 // TODO: i18n
 
 RealtimeUpdate = {
diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php
index 82d772048..d59d63e47 100644
--- a/plugins/SimpleUrl/SimpleUrlPlugin.php
+++ b/plugins/SimpleUrl/SimpleUrlPlugin.php
@@ -65,15 +65,6 @@ class SimpleUrlPlugin extends Plugin
 class SimpleUrl extends ShortUrlApi
 {
     protected function shorten_imp($url) {
-        $curlh = curl_init();
-        curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 20); // # seconds to wait
-        curl_setopt($curlh, CURLOPT_USERAGENT, 'StatusNet');
-        curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
-
-        curl_setopt($curlh, CURLOPT_URL, $this->service_url.urlencode($url));
-        $short_url = curl_exec($curlh);
-
-        curl_close($curlh);
-        return $short_url;
+        return $this->http_get($url);
     }
 }
diff --git a/plugins/TwitterBridge/daemons/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php
index ed2bf48a2..671e3c7af 100755
--- a/plugins/TwitterBridge/daemons/synctwitterfriends.php
+++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php
@@ -152,8 +152,8 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
             $friends_ids = $client->friendsIds();
         } catch (Exception $e) {
             common_log(LOG_WARNING, $this->name() .
-                       ' - cURL error getting friend ids ' .
-                       $e->getCode() . ' - ' . $e->getMessage());
+                       ' - error getting friend ids: ' .
+                       $e->getMessage());
             return $friends;
         }
 
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 81bbbc7c5..b5428316b 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -109,12 +109,16 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         $flink->find();
 
         $flinks = array();
+        common_log(LOG_INFO, "hello");
 
         while ($flink->fetch()) {
 
             if (($flink->noticesync & FOREIGN_NOTICE_RECV) ==
                 FOREIGN_NOTICE_RECV) {
                 $flinks[] = clone($flink);
+                common_log(LOG_INFO, "sync: foreign id $flink->foreign_id");
+            } else {
+                common_log(LOG_INFO, "nothing to sync");
             }
         }
 
@@ -515,31 +519,32 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         return $id;
     }
 
+    /**
+     * Fetch a remote avatar image and save to local storage.
+     *
+     * @param string $url avatar source URL
+     * @param string $filename bare local filename for download
+     * @return bool true on success, false on failure
+     */
     function fetchAvatar($url, $filename)
     {
-        $avatarfile = Avatar::path($filename);
+        common_debug($this->name() . " - Fetching Twitter avatar: $url");
 
-        $out = fopen($avatarfile, 'wb');
-        if (!$out) {
-            common_log(LOG_WARNING, $this->name() .
-                       " - Couldn't open file $filename");
+        $request = HTTPClient::start();
+        $response = $request->get($url);
+        if ($response->isOk()) {
+            $avatarfile = Avatar::path($filename);
+            $ok = file_put_contents($avatarfile, $response->getBody());
+            if (!$ok) {
+                common_log(LOG_WARNING, $this->name() .
+                           " - Couldn't open file $filename");
+                return false;
+            }
+        } else {
             return false;
         }
 
-        common_debug($this->name() . " - Fetching Twitter avatar: $url");
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_FILE, $out);
-        curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 0);
-        $result = curl_exec($ch);
-        curl_close($ch);
-
-        fclose($out);
-
-        return $result;
+        return true;
     }
 }
 
diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 1a5248a9b..3c6803e49 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -215,7 +215,7 @@ function broadcast_basicauth($notice, $flink)
 
     try {
         $status = $client->statusesUpdate($statustxt);
-    } catch (BasicAuthCurlException $e) {
+    } catch (HTTP_Request2_Exception $e) {
         return process_error($e, $flink);
     }
 
diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php
index 2a93ff13e..f1daefab1 100644
--- a/plugins/TwitterBridge/twitterauthorization.php
+++ b/plugins/TwitterBridge/twitterauthorization.php
@@ -125,7 +125,7 @@ class TwitterauthorizationAction extends Action
 
             $auth_link = $client->getAuthorizeLink($req_tok);
 
-        } catch (TwitterOAuthClientException $e) {
+        } catch (OAuthClientException $e) {
             $msg = sprintf('OAuth client cURL error - code: %1s, msg: %2s',
                            $e->getCode(), $e->getMessage());
             $this->serverError(_('Couldn\'t link your Twitter account.'));
diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php
index 1040d72fb..d1cf45aec 100644
--- a/plugins/TwitterBridge/twitterbasicauthclient.php
+++ b/plugins/TwitterBridge/twitterbasicauthclient.php
@@ -32,26 +32,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 /**
- * Exception wrapper for cURL errors
- *
- * @category Integration
- * @package  StatusNet
- * @author Adrian Lang <mail@adrianlang.de>
- * @author Brenda Wallace <shiny@cpan.org>
- * @author Craig Andrews <candrews@integralblue.com>
- * @author Dan Moore <dan@moore.cx>
- * @author Evan Prodromou <evan@status.net>
- * @author mEDI <medi@milaro.net>
- * @author Sarven Capadisli <csarven@status.net>
- * @author Zach Copley <zach@status.net> * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- */
-class BasicAuthCurlException extends Exception
-{
-}
-
-/**
  * Class for talking to the Twitter API with HTTP Basic Auth.
  *
  * @category Integration
@@ -198,45 +178,27 @@ class TwitterBasicAuthClient
      */
     function httpRequest($url, $params = null, $auth = true)
     {
-        $options = array(
-                         CURLOPT_RETURNTRANSFER => true,
-                         CURLOPT_FAILONERROR    => true,
-                         CURLOPT_HEADER         => false,
-                         CURLOPT_FOLLOWLOCATION => true,
-                         CURLOPT_USERAGENT      => 'StatusNet',
-                         CURLOPT_CONNECTTIMEOUT => 120,
-                         CURLOPT_TIMEOUT        => 120,
-                         CURLOPT_HTTPAUTH       => CURLAUTH_ANY,
-                         CURLOPT_SSL_VERIFYPEER => false,
-
-                         // Twitter is strict about accepting invalid "Expect" headers
-
-                         CURLOPT_HTTPHEADER => array('Expect:')
-                         );
-
-        if (isset($params)) {
-            $options[CURLOPT_POST]       = true;
-            $options[CURLOPT_POSTFIELDS] = $params;
-        }
+        $request = HTTPClient::start();
+        $request->setConfig(array(
+            'follow_redirects' => true,
+            'connect_timeout' => 120,
+            'timeout' => 120,
+            'ssl_verifypeer' => false,
+        ));
 
         if ($auth) {
-            $options[CURLOPT_USERPWD] = $this->screen_name .
-              ':' . $this->password;
+            $request->setAuth($this->screen_name, $this->password);
         }
 
-        $ch = curl_init($url);
-        curl_setopt_array($ch, $options);
-        $response = curl_exec($ch);
-
-        if ($response === false) {
-            $msg  = curl_error($ch);
-            $code = curl_errno($ch);
-            throw new BasicAuthCurlException($msg, $code);
+        if (isset($params)) {
+            // Twitter is strict about accepting invalid "Expect" headers
+            $headers = array('Expect:');
+            $response = $request->post($url, $headers, $params);
+        } else {
+            $response = $request->get($url);
         }
 
-        curl_close($ch);
-
-        return $response;
+        return $response->getBody();
     }
 
 }
diff --git a/plugins/WikiHashtagsPlugin.php b/plugins/WikiHashtagsPlugin.php
index 0c5649aa4..334fc13ba 100644
--- a/plugins/WikiHashtagsPlugin.php
+++ b/plugins/WikiHashtagsPlugin.php
@@ -68,14 +68,13 @@ class WikiHashtagsPlugin extends Plugin
                 $editurl = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=edit',
                                    urlencode($tag));
 
-                $context = stream_context_create(array('http' => array('method' => "GET",
-                                                                       'header' =>
-                                                                       "User-Agent: " . $this->userAgent())));
-                $html = @file_get_contents($url, false, $context);
+                $request = HTTPClient::start();
+                $response = $request->get($url);
+                $html = $response->getBody();
 
                 $action->elementStart('div', array('id' => 'wikihashtags', 'class' => 'section'));
 
-                if (!empty($html)) {
+                if ($response->isOk() && !empty($html)) {
                     $action->element('style', null,
                                      "span.editsection { display: none }\n".
                                      "table.toc { display: none }");
@@ -100,10 +99,4 @@ class WikiHashtagsPlugin extends Plugin
 
         return true;
     }
-
-    function userAgent()
-    {
-        return 'WikiHashtagsPlugin/'.WIKIHASHTAGSPLUGIN_VERSION .
-          ' StatusNet/' . STATUSNET_VERSION;
-    }
 }
diff --git a/scripts/console.php b/scripts/console.php
new file mode 100755
index 000000000..41dd43f28
--- /dev/null
+++ b/scripts/console.php
@@ -0,0 +1,162 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+# Abort if called from a web server
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$helptext = <<<ENDOFHELP
+console.php - provide an interactive PHP interpreter for testing
+
+ENDOFHELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (function_exists('posix_isatty')) {
+    define('CONSOLE_INTERACTIVE', posix_isatty(0));
+} else {
+    // Windows? Assume we're on a terminal. :P
+    define('CONSOLE_INTERACTIVE', false);
+}
+if (CONSOLE_INTERACTIVE) {
+    define('CONSOLE_READLINE', function_exists('readline'));
+}
+
+if (CONSOLE_READLINE && CONSOLE_INTERACTIVE && file_exists(CONSOLE_HISTORY)) {
+    define(CONSOLE_HISTORY, getenv("HOME") . "/.statusnet_console_history");
+    readline_read_history(CONSOLE_HISTORY);
+}
+
+function read_input_line($prompt)
+{
+    if (CONSOLE_INTERACTIVE) {
+        if (CONSOLE_READLINE) {
+            $line = readline($prompt);
+            readline_add_history($line);
+            return $line;
+        } else {
+            return readline_emulation($prompt);
+        }
+    } else {
+        return fgets(STDIN);
+    }
+}
+
+/**
+ * On Unix-like systems where PHP readline extension isn't present,
+ * -cough- Mac OS X -cough- we can shell out to bash to do it for us.
+ * This lets us at least handle things like arrow keys, but we don't
+ * get any entry history. :(
+ *
+ * Shamelessly ripped from when I wrote the same code for MediaWiki. :)
+ * @author Brion Vibber <brion@status.net>
+ *
+ * @param string $prompt
+ * @return mixed string on success, false on fail or EOF
+ */
+function readline_emulation($prompt)
+{
+    if(file_exists(trim(shell_exec('which bash')))) {
+        $encPrompt = escapeshellarg($prompt);
+        $command = "read -er -p $encPrompt && echo \"\$REPLY\"";
+        $encCommand = escapeshellarg($command);
+        $metaCommand = "bash -c $encCommand";
+
+        // passthru passes our STDIN and TTY to the child...
+        // We can pull the returned string via output buffering.
+        ob_start();
+        $retval = false;
+        passthru($metaCommand, $retval);
+        $line = ob_get_contents();
+        ob_end_clean();
+
+        if ($retval == 0) {
+            return $line;
+        } elseif ($retval == 127) {
+            // Couldn't execute bash even though we thought we saw it.
+            // Shell probably spit out an error message, sorry :(
+            // Fall through to fgets()...
+        } else {
+            // EOF/ctrl+D
+            return false;
+        }
+    }
+
+    // Fallback... we'll have no editing controls, EWWW
+    if (feof(STDIN)) {
+        return false;
+    }
+    print $prompt;
+    return fgets(STDIN);
+}
+
+function console_help()
+{
+    print "Welcome to StatusNet's interactive PHP console!\n";
+    print "Type some PHP code and it'll execute...\n";
+    print "\n";
+    print "Hint: return a value of any type to output it via var_export():\n";
+    print "  \$profile = new Profile();\n";
+    print "  \$profile->find();\n";
+    print "  \$profile->fetch();\n";
+    print "  return \$profile;\n";
+    print "\n";
+    print "Note that PHP is cranky and you can easily kill your session by mistyping.\n";
+    print "\n";
+    print "Type ctrl+D or enter 'exit' to exit.\n";
+}
+
+
+print "StatusNet interactive PHP console... type ctrl+D or enter 'exit' to exit.\n";
+$prompt = common_config('site', 'name') . '> ';
+while (!feof(STDIN)) {
+    $line = read_input_line($prompt);
+    if ($line === false) {
+        print "\n";
+        break;
+    } elseif ($line !== '') {
+        try {
+            if (trim($line) == 'exit') {
+                break;
+            } elseif (trim($line) == 'help') {
+                console_help();
+                continue;
+            }
+            
+            // Let's do this!
+            $result = eval($line);
+            if ($result === false) {
+                // parse error
+            } elseif ($result === null) {
+                // no return
+            } else {
+                // return value from eval'd code
+                var_export($result);
+            }
+        } catch(Exception $e) {
+            print get_class($e) . ": " . $e->getMessage() . "\n";
+        }
+    }
+    print "\n";
+}
+
+if (CONSOLE_READLINE && CONSOLE_INTERACTIVE) {
+    @readline_write_history(CONSOLE_HISTORY);
+}
diff --git a/scripts/enjitqueuehandler.php b/scripts/enjitqueuehandler.php
index 08f733b07..afcac539a 100755
--- a/scripts/enjitqueuehandler.php
+++ b/scripts/enjitqueuehandler.php
@@ -46,8 +46,8 @@ class EnjitQueueHandler extends QueueHandler
 
     function start()
     {
-                $this->log(LOG_INFO, "Starting EnjitQueueHandler");
-                $this->log(LOG_INFO, "Broadcasting to ".common_config('enjit', 'apiurl'));
+        $this->log(LOG_INFO, "Starting EnjitQueueHandler");
+        $this->log(LOG_INFO, "Broadcasting to ".common_config('enjit', 'apiurl'));
         return true;
     }
 
@@ -56,16 +56,16 @@ class EnjitQueueHandler extends QueueHandler
 
         $profile = Profile::staticGet($notice->profile_id);
 
-                $this->log(LOG_INFO, "Posting Notice ".$notice->id." from ".$profile->nickname);
+        $this->log(LOG_INFO, "Posting Notice ".$notice->id." from ".$profile->nickname);
 
-                if ( ! $notice->is_local ) {
-                    $this->log(LOG_INFO, "Skipping remote notice");
-                    return "skipped";
-                }
+        if ( ! $notice->is_local ) {
+            $this->log(LOG_INFO, "Skipping remote notice");
+            return "skipped";
+        }
 
-                #
-                # Build an Atom message from the notice
-                #
+        #
+        # Build an Atom message from the notice
+        #
         $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
         $msg = $profile->nickname . ': ' . $notice->content;
 
@@ -86,36 +86,18 @@ class EnjitQueueHandler extends QueueHandler
         $atom .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\n";
         $atom .= "</entry>\n";
 
-                $url  = common_config('enjit', 'apiurl') . "/submit/". common_config('enjit','apikey');
-                $data = "msg=$atom";
+        $url  = common_config('enjit', 'apiurl') . "/submit/". common_config('enjit','apikey');
+        $data = array(
+            'msg' => $atom,
+        );
 
-                #
-                # POST the message to $config['enjit']['apiurl']
-                #
-        $ch   = curl_init();
+        #
+        # POST the message to $config['enjit']['apiurl']
+        #
+        $request = HTTPClient::start();
+        $response = $request->post($url, null, $data);
 
-        curl_setopt($ch, CURLOPT_URL, $url);
-
-                curl_setopt($ch, CURLOPT_HEADER, 1);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_POST, 1) ;
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-
-                # SSL and Debugging options
-                #
-        # curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-        # curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-                # curl_setopt($ch, CURLOPT_VERBOSE, 1);
-
-        $result = curl_exec($ch);
-
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE );
-
-                $this->log(LOG_INFO, "Response Code: $code");
-
-        curl_close($ch);
-
-                return $code;
+        return $response->isOk();
     }
 
 }
diff --git a/scripts/makegroupadmin.php b/scripts/makegroupadmin.php
new file mode 100644
index 000000000..a68798451
--- /dev/null
+++ b/scripts/makegroupadmin.php
@@ -0,0 +1,89 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'g:n:';
+$longoptions = array('nickname=', 'group=');
+
+$helptext = <<<END_OF_MAKEGROUPADMIN_HELP
+makegroupadmin.php [options]
+makes a user the admin of a group
+
+  -g --group    group to add an admin to
+  -n --nickname nickname of the new admin
+
+END_OF_MAKEGROUPADMIN_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+$nickname = get_option_value('n', 'nickname');
+$groupname = get_option_value('g', 'group');
+
+if (empty($nickname) || empty($groupname)) {
+    print "Must provide a nickname and group.\n";
+    exit(1);
+}
+
+try {
+
+    $user = User::staticGet('nickname', $nickname);
+
+    if (empty($user)) {
+        throw new Exception("No user named '$nickname'.");
+    }
+
+    $group = User_group::staticGet('nickname', $groupname);
+
+    if (empty($group)) {
+        throw new Exception("No group named '$groupname'.");
+    }
+
+    $member = Group_member::pkeyGet(array('group_id' => $group->id,
+                                          'profile_id' => $user->id));
+
+    if (empty($member)) {
+        $member = new Group_member();
+
+        $member->group_id   = $group->id;
+        $member->profile_id = $user->id;
+        $member->created    = common_sql_now();
+
+        if (!$member->insert()) {
+            throw new Exception("Can't add '$nickname' to '$groupname'.");
+        }
+    }
+
+    if ($member->is_admin) {
+        throw new Exception("'$nickname' is already an admin of '$groupname'.");
+    }
+
+    $orig = clone($member);
+
+    $member->is_admin = 1;
+
+    if (!$member->update($orig)) {
+        throw new Exception("Can't make '$nickname' admin of '$groupname'.");
+    }
+
+} catch (Exception $e) {
+    print $e->getMessage() . "\n";
+    exit(1);
+}
diff --git a/scripts/registeruser.php b/scripts/registeruser.php
new file mode 100644
index 000000000..5d9c8862d
--- /dev/null
+++ b/scripts/registeruser.php
@@ -0,0 +1,81 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'n:w:f:e:';
+$longoptions = array('nickname=', 'password=', 'fullname=', 'email=');
+
+$helptext = <<<END_OF_REGISTERUSER_HELP
+registeruser.php [options]
+registers a user in the database
+
+  -n --nickname nickname of the new user
+  -w --password password of the new user
+  -f --fullname full name of the new user (optional)
+  -e --email    email address of the new user (optional)
+
+END_OF_REGISTERUSER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+$nickname = get_option_value('n', 'nickname');
+$password = get_option_value('w', 'password');
+$fullname = get_option_value('f', 'fullname');
+
+$email = get_option_value('e', 'email');
+
+if (empty($nickname) || empty($password)) {
+    print "Must provide a username and password.\n";
+    exit(1);
+}
+
+try {
+
+    $user = User::staticGet('nickname', $nickname);
+
+    if (!empty($user)) {
+        throw new Exception("A user named '$nickname' already exists.");
+    }
+
+    $user = User::register(array('nickname' => $nickname,
+                                 'password' => $password,
+                                 'fullname' => $fullname));
+
+    if (empty($user)) {
+        throw new Exception("Can't register user '$nickname' with password '$password' and fullname '$fullname'.");
+    }
+
+    if (!empty($email)) {
+
+        $orig = clone($user);
+
+        $user->email = $email;
+
+        if (!$user->updateKeys($orig)) {
+            print "Failed!\n";
+            throw new Exception("Can't update email address.");
+        }
+    }
+
+} catch (Exception $e) {
+    print $e->getMessage() . "\n";
+    exit(1);
+}
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index f145c1f0b..580c472ee 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -39,12 +39,47 @@ set_time_limit(60);
 $languages = get_all_languages();
 
 /* Update the languages */
+// Language code conversion for translatewiki.net (these are MediaWiki codes)
+$codeMap = array(
+	'nb'    => 'no',
+	'pt_BR' => 'pt-br',
+	'zh_CN' => 'zh-hans',
+	'zh_TW' => 'zh-hant'
+);
+
+$doneCodes = array();
 
 foreach ($languages as $language) {
+	$code = $language['lang'];
+
+	// Skip export of source language
+	// and duplicates
+	if( $code == 'en' || $code == 'no' ) {
+		continue;
+	}
+
+	// Do not export codes twice (happens for 'nb')
+	if( in_array( $code, $doneCodes ) ) {
+		continue;
+	} else {
+		$doneCodes[] = $code;
+	}
+
+	// Convert code if needed
+	if( isset( $codeMap[$code] ) ) {
+		$twnCode = $codeMap[$code];
+	} else {
+		$twnCode = str_replace('_', '-', strtolower($code)); // pt_BR -> pt-br
+	}
+
+    // Fetch updates from translatewiki.net...
+    $file_url = 'http://translatewiki.net/w/i.php?' .
+        http_build_query(array(
+            'title' => 'Special:Translate',
+            'task' => 'export-to-file',
+            'group' => 'out-statusnet',
+            'language' => $twnCode));
 
-    $code = $language['lang'];
-    $file_url = 'http://status.net/pootle/' . $code .
-        '/statusnet/LC_MESSAGES/statusnet.po';
     $lcdir = INSTALLDIR . '/locale/' . $code;
     $msgdir = "$lcdir/LC_MESSAGES";
     $pofile = "$msgdir/statusnet.po";
@@ -72,7 +107,8 @@ foreach ($languages as $language) {
     if (sha1($new_file) != $existingSHA1 || !file_exists($mofile)) {
         echo "Updating ".$code."\n";
         file_put_contents($pofile, $new_file);
-        system(sprintf('msgmerge -U %s %s', $pofile, $statusnet_pot));
+        // --backup=off is workaround for Mac OS X fail
+        system(sprintf('msgmerge -U --backup=off %s %s', $pofile, $statusnet_pot));
         system(sprintf('msgfmt -f -o %s %s', $mofile, $pofile));
     } else {
         echo "Unchanged - ".$code."\n";
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index 0cc03ccce..d83f9faf5 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -185,12 +185,12 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('http://example.com/path/(foo)/bar',
                            '<a href="http://example.com/path/(foo)/bar" title="http://example.com/path/(foo)/bar" rel="external">http://example.com/path/(foo)/bar</a>'),
                      array('http://example.com/path/[foo]/bar',
-                           '<a href="http://example.com/path/[foo]/bar" title="http://example.com/path/[foo]/bar" rel="external">http://example.com/path/[foo]/bar</a>'),
+                           '<a href="http://example.com/path/" title="http://example.com/path/" rel="external">http://example.com/path/</a>[foo]/bar'),
                      array('http://example.com/path/foo/(bar)',
                            '<a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>'),
                      //Not a valid url - urls cannot contain unencoded square brackets
                      array('http://example.com/path/foo/[bar]',
-                           '<a href="http://example.com/path/foo/[bar]" title="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
+                           '<a href="http://example.com/path/foo/" title="http://example.com/path/foo/" rel="external">http://example.com/path/foo/</a>[bar]'),
                      array('Hey, check out my cool site http://example.com okay?',
                            'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a> okay?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar))?',
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8355a0a5c..1bab7d965 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -533,6 +533,16 @@ float:right;
 font-size:0.8em;
 }
 
+button.close {
+width:16px;
+height:16px;
+text-indent:-9999px;
+padding:0;
+border:0;
+text-align:center;
+font-weight:bold;
+}
+
 /* entity_profile */
 .entity_profile {
 position:relative;
@@ -582,14 +592,18 @@ margin-left:0;
 font-size:1.1em;
 font-weight:bold;
 }
-.entity_profile .entity_fn dd:before {
+.entity_profile .fn:before {
 content: "(";
 font-weight:normal;
 }
-.entity_profile .entity_fn dd:after {
+.entity_profile .fn:after {
 content: ")";
 font-weight:normal;
 }
+.entity_profile .nickname:after,
+.entity_profile .nickname:before {
+content:"";
+}
 .entity_profile dt,
 .entity_profile h2 {
 display:none;
@@ -683,12 +697,12 @@ top:34px;
 right:-1px;
 padding:1.795%;
 width:65%;
-z-index:1;
-
-background-color:#FFFFFF;
-border:1px solid #CCCCCC;
--moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+z-index:2;
+ border-radius:7px;
 -moz-border-radius:7px;
+-webkit-radius-border:7px;
+border-width:1px;
+border-style:solid;
 }
 .entity_send-a-message .form_notice legend {
 display:block;
@@ -772,18 +786,22 @@ display:none;
 .profiles {
 list-style-type:none;
 }
-.profile .entity_profile .entity_location {
+.profile .entity_profile .fn.nickname,
+.profile .entity_profile .url[rel~=contact] {
+margin-left:0;
+display:inline;
+}
+
+.profile .entity_profile .fn,
+.profile .entity_profile .location {
+margin-left:11px;
+margin-bottom:4px;
 width:auto;
 clear:none;
-margin-left:11px;
 }
-.profile .entity_profile dl,
-.profile .entity_profile dd {
-display:inline;
-float:none;
-}
-.profile .entity_profile .entity_note,
-.profile .entity_profile .entity_url,
+
+.profile .entity_profile .note,
+.profile .entity_profile .url,
 .profile .entity_profile .entity_tags,
 .profile .entity_profile .form_subscription_edit {
 margin-left:59px;
@@ -1025,11 +1043,6 @@ margin-bottom:11px;
 position:absolute;
 top:0;
 right:0;
-width:29px;
-height:29px;
-text-align:center;
-font-weight:bold;
-padding:0;
 }
 #jOverlayContent h1 {
 max-width:425px;
diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png
index c4e371330..f83c30177 100644
--- a/theme/base/images/icons/icons-01.png
+++ b/theme/base/images/icons/icons-01.png
diff --git a/theme/base/images/icons/twotone/green/x.gif b/theme/base/images/icons/twotone/green/x.gif
new file mode 100644
index 000000000..ffb2efea0
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/x.gif
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 5eff5842a..910f915a8 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -28,7 +28,8 @@ input, textarea, select,
 .entity_remote_subscribe {
 border-color:#AAAAAA;
 }
-#filter_tags ul li {
+#filter_tags ul li,
+.entity_send-a-message .form_notice {
 border-color:#DDDDDD;
 }
 
@@ -88,12 +89,39 @@ color:#333333;
 color:#000000;
 }
 .form_notice label[for=notice_data-attach] {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
+background-position:0 -328px;
 }
 .form_notice #notice_data-attach {
 opacity:0;
 }
 
+.form_notice label[for=notice_data-attach],
+#export_data li a.rss,
+#export_data li a.atom,
+#export_data li a.foaf,
+.entity_edit a,
+.entity_send-a-message a,
+.entity_nudge p,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.form_make_admin input.submit,
+.notice .attachment,
+.notice-options .notice_reply,
+.notice-options form.form_favor input.submit,
+.notice-options form.form_disfavor input.submit,
+.notice-options .notice_delete,
+#new_group a,
+.pagination .nav_prev a,
+.pagination .nav_next a,
+button.close {
+background-image:url(../../base/images/icons/icons-01.png);
+background-repeat:no-repeat;
+background-color:transparent;
+}
+
 #wrap form.processing input.submit {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
@@ -112,7 +140,8 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 border-color:transparent;
 }
 #content,
-#site_nav_local_views .current a {
+#site_nav_local_views .current a,
+.entity_send-a-message .form_notice {
 background-color:#FFFFFF;
 }
 
@@ -138,6 +167,10 @@ background-color:#F7E8E8;
 background-color:#EFF3DC;
 }
 
+button.close {
+background-position:0 -1120px;
+}
+
 #anon_notice {
 background-color:#87B4C8;
 color:#FFFFFF;
@@ -152,30 +185,15 @@ background-color:#9BB43E;
 background-repeat:no-repeat;
 }
 #export_data li a.rss {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 -130px;
 }
 #export_data li a.atom {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 -64px;
 }
 #export_data li a.foaf {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 1px;
 }
 
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
-background-repeat: no-repeat;
-background-color:transparent;
-}
 .form_group_join input.submit,
 .form_group_leave input.submit
 .form_user_subscribe input.submit,
@@ -190,48 +208,49 @@ background-color:#87B4C8;
 }
 
 .entity_edit a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position: 0 -718px;
 }
 .entity_send-a-message a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position: 0 -849px;
 }
+.entity_send-a-message .form_notice {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+}
+
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position: 0 -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position: 0 -918px;
 }
 .form_make_admin input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position: 0 -983px;
 }
 
 /* NOTICES */
 .notice .attachment {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px;
+background-position:0 -394px;
 }
 #attachments .attachment {
 background:none;
 }
 .notice-options .notice_reply {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px;
+background-position:0 -589px;
 }
 .notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px;
+background-position:0 -457px;
 }
 .notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px;
+background-position:0 -523px;
 }
 .notice-options .notice_delete {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px;
+background-position:0 -655px;
 }
 
 .notices div.entry-content,
@@ -268,7 +287,7 @@ background-color:rgba(200, 200, 200, 0.300);
 /*END: NOTICES */
 
 #new_group a {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px;
+background-position:0 -1054px;
 }
 
 .pagination .nav_prev a,
@@ -277,10 +296,8 @@ background-repeat:no-repeat;
 border-color:#C8D1D5;
 }
 .pagination .nav_prev a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:10% -187px;
 }
 .pagination .nav_next a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:105% -252px;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 8aedd5144..2aa087331 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -28,7 +28,8 @@ input, textarea, select,
 .entity_remote_subscribe {
 border-color:#AAAAAA;
 }
-#filter_tags ul li {
+#filter_tags ul li,
+.entity_send-a-message .form_notice {
 border-color:#DDDDDD;
 }
 
@@ -88,12 +89,39 @@ color:#333333;
 color:#000000;
 }
 .form_notice label[for=notice_data-attach] {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
+background-position:0 -328px;
 }
 .form_notice #notice_data-attach {
 opacity:0;
 }
 
+.form_notice label[for=notice_data-attach],
+#export_data li a.rss,
+#export_data li a.atom,
+#export_data li a.foaf,
+.entity_edit a,
+.entity_send-a-message a,
+.entity_nudge p,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.form_make_admin input.submit,
+.notice .attachment,
+.notice-options .notice_reply,
+.notice-options form.form_favor input.submit,
+.notice-options form.form_disfavor input.submit,
+.notice-options .notice_delete,
+#new_group a,
+.pagination .nav_prev a,
+.pagination .nav_next a,
+button.close {
+background-image:url(../../base/images/icons/icons-01.png);
+background-repeat:no-repeat;
+background-color:transparent;
+}
+
 #wrap form.processing input.submit {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
@@ -112,7 +140,8 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 border-color:transparent;
 }
 #content,
-#site_nav_local_views .current a {
+#site_nav_local_views .current a,
+.entity_send-a-message .form_notice {
 background-color:#FFFFFF;
 }
 
@@ -138,6 +167,10 @@ background-color:#F7E8E8;
 background-color:#EFF3DC;
 }
 
+button.close {
+background-position:0 -1120px;
+}
+
 #anon_notice {
 background-color:#87B4C8;
 color:#FFFFFF;
@@ -152,30 +185,15 @@ background-color:#9BB43E;
 background-repeat:no-repeat;
 }
 #export_data li a.rss {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 -130px;
 }
 #export_data li a.atom {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 -64px;
 }
 #export_data li a.foaf {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 1px;
 }
 
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
-background-repeat: no-repeat;
-background-color:transparent;
-}
 .form_group_join input.submit,
 .form_group_leave input.submit
 .form_user_subscribe input.submit,
@@ -190,48 +208,49 @@ background-color:#87B4C8;
 }
 
 .entity_edit a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position: 0 -718px;
 }
 .entity_send-a-message a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position: 0 -849px;
 }
+.entity_send-a-message .form_notice {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+}
+
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position: 0 -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position: 0 -918px;
 }
 .form_make_admin input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position: 0 -983px;
 }
 
 /* NOTICES */
 .notice .attachment {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px;
+background-position:0 -394px;
 }
 #attachments .attachment {
 background:none;
 }
 .notice-options .notice_reply {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px;
+background-position:0 -589px;
 }
 .notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px;
+background-position:0 -457px;
 }
 .notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px;
+background-position:0 -523px;
 }
 .notice-options .notice_delete {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px;
+background-position:0 -655px;
 }
 
 .notices div.entry-content,
@@ -268,7 +287,7 @@ background-color:rgba(200, 200, 200, 0.300);
 /*END: NOTICES */
 
 #new_group a {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px;
+background-position:0 -1054px;
 }
 
 .pagination .nav_prev a,
@@ -277,10 +296,8 @@ background-repeat:no-repeat;
 border-color:#CEE1E9;
 }
 .pagination .nav_prev a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:10% -187px;
 }
 .pagination .nav_next a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:105% -252px;
 }